Merge branch 'master' into webrtc

# Conflicts:
#	front/src/Phaser/Game/GameManager.ts

diff --cc front/src/Phaser/Game/GameManager.ts
index f4f24ef5a70c0f1fe36590d13f558a75624e48e0,e18bbdd616510735758604388dd21bac7a9cd5bc..fe04a950d74210dff1fcfcc54d8948cef97344af
--- 1/front/src/Phaser/Game/GameManager.ts
--- 2/front/src/Phaser/Game/GameManager.ts
+++ b/front/src/Phaser/Game/GameManager.ts
@@@ -24,19 -22,12 +24,12 @@@ export class GameManager implements Gam
  
      constructor() {
          this.status = StatusGameManagerEnum.IN_PROGRESS;
-         ConnexionInstance = new Connexion("test@gmail.com", this);
+         this.configureGame();
      }
 -    
 +
-     createGame(){
-         return ConnexionInstance.createConnexion().then(() => {
-             this.configureGame();
-             /** TODO add loader in the page **/
-             //initialise Pear Connexion of game
-             this.SimplePeer = new SimplePeer(ConnexionInstance);
-         }).catch((err) => {
-             console.error(err);
-             throw err;
-         });
+     connect(email:string) {
 -        this.ConnexionInstance = new Connexion(email, this);
 -        return this.ConnexionInstance.createConnexion()
++        ConnexionInstance = new Connexion(email, this);
++        this.SimplePeer = new SimplePeer(ConnexionInstance);
      }
  
      /**

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