Merge branch 'master' into webrtc

# Conflicts:
#	back/src/Model/Websocket/MessageUserPosition.ts

back/package.json

@@ -8,7 +8,8 @@
     "dev": "ts-node-dev --respawn --transpileOnly ./server.ts",
     "prod": "tsc && node ./dist/server.js",
     "test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",
-    "lint": "node_modules/.bin/eslint src/ . --ext .ts"
+    "lint": "node_modules/.bin/eslint src/ . --ext .ts",
+    "fix": "node_modules/.bin/eslint src/ . --ext .ts"
   },
   "repository": {
     "type": "git",

back/src/Model/Group.ts

@@ -4,7 +4,7 @@ import { UserInterface } from "./UserInterface";
 
 export class Group {
     static readonly MAX_PER_GROUP = 4;
-    
+
     private users: UserInterface[];
     private connectCallback: (user1: string, user2: string) => void;
     private disconnectCallback: (user1: string, user2: string) => void;
@@ -14,7 +14,7 @@ export class Group {
         this.users = [];
         this.connectCallback = connectCallback;
         this.disconnectCallback = disconnectCallback;
-        
+
         users.forEach((user: UserInterface) => {
             this.join(user);
         });
@@ -62,7 +62,7 @@ export class Group {
 
     removeFromGroup(users: UserInterface[]): void
     {
-        for(let i = 0; i < users.length; i++) {
+        for(let i = 0; i < users.length; i++){
             let user = users[i];
             const index = this.users.indexOf(user, 0);
             if (index > -1) {
@@ -70,4 +70,4 @@ export class Group {
             }
         }
     }
-}
+}

back/src/Model/Websocket/MessageUserPosition.ts

@@ -41,4 +41,4 @@ export class MessageUserPosition extends Message{
                 })
         );
     }
-}
+}