continued work AP-119
Merge remote-tracking branch 'origin/AP-9' into Server_sprint_4
AP-119
Merge remote-tracking branch 'origin/AP-9' into Server_sprint_4
AP-119
Merge remote-tracking branch 'origin/AP-9' into Server_sprint_4
AP-119
backup for client side server communication
Merge remote-tracking branch 'origin/Server_sprint_4' into AP-9

Conflicts:
	client/maps.txt
quick fix! AP-119
minor gamestate changes for client server
Merge remote-tracking branch 'origin/Server_sprint_4' into AP-9
Revision 1 client server create game communication
Merge remote-tracking branch 'origin/AP-9' into AP-9