Merge from master

diff --cc front/src/Phaser/Game/GameScene.ts
Simple merge

diff --cc front/src/Phaser/Login/LogincScene.ts
index e160ca8fa89ee23584f305b7634c6bc4d596122a,c9c22f0f16d0dc020d1d60a6a77e0de1f3d97142..1807ecb5c126a4c0c7d83a6b63ac67e2a561e422
--- 1/front/src/Phaser/Login/LogincScene.ts
--- 2/front/src/Phaser/Login/LogincScene.ts
+++ b/front/src/Phaser/Login/LogincScene.ts
@@@ -3,8 -3,8 +3,7 @@@ import {TextField} from "../Components/
  import {TextInput} from "../Components/TextInput";
  import {ClickButton} from "../Components/ClickButton";
  import {GameSceneName} from "../Game/GameScene";
 -import {SimplePeer} from "../../WebRtc/SimplePeer";
 -import {Connexion} from "../../Connexion";
 +import Image = Phaser.GameObjects.Image;
- import Key = Phaser.Input.Keyboard.Key;
  
  //todo: put this constants in a dedicated file
  export const LoginSceneName = "LoginScene";

diff --cc front/src/Phaser/Player/Player.ts
Simple merge