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

@@ -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) {