playerId param
Merge branch 'ReDesign' of https://github.com/FardadJalili/shelem into ReDesign

Conflicts:
	game/server/routes/game.js
minor