Fixed JSON parsing issue
Moved code from gamewebsocketendpoint to the gameserver
Merge iss5