Commiting all these changes
Merge branch 'feature/lobby-join-game' of github.com:GameDigitizers/mustached-octo-widget into feature/lobby-join-game

Conflicts:
	server/api/game/game.controller.js
Merge branch 'feature/lobby-join-game' of github.com:GameDigitizers/mustached-octo-widget into feature/lobby-join-game
Added many schemas to game.model.js - they need to be split out