Merged network
Merge branch 'gamemodel' into client

Conflicts:
	client/GameClient.cpp
	client/GameUI.cpp
	client/GameUI.h
	client/OnEvent.cpp
	gamemodel/GameEntity.h
	gamemodel/Player.h
	gamemodel/entities/EArmy.cpp
	gamemodel/entities/EArmy.h
Recovered code removed in merge.
recieve networkinformation