Enabled messages from server to client
!forget this!
Revert "!forget this!"

This reverts commit cb08a5d54891278ecb72798a6f540bab75c16075.
Merge branch 'gamemodel' into network
Merge branch 'client' into network

Conflicts:
	gamemodel/GameMap.cpp
	gamemodel/GameMap.h
GameClient.cpp updated for network.
Fixed our big and heavy bug, finally!
Some small cleanup and bugfixes
Some small cleanup and bugfixes

Conflicts:

	gamemodel/actions/ARecruit.h
	gamemodel/entities/ELocation.cpp
Updated CI conf
Update CI config
Some small cleanup and bugfixes

Conflicts:

	gamemodel/actions/ARecruit.h
	gamemodel/entities/ELocation.cpp
Revert "modified the gamemodel" for now

This reverts commit 4c9e9f3cb22c0cf6d544045c0905a92d269d4cdf.

Conflicts:

	gamemodel/entities/buildings/ECasern.h
	gamemodel/entities/buildings/EMarket.h
	gamemodel/entities/buildings/ERidge.h
	gamemodel/entities/buildings/ETower.h
	gamemodel/entities/buildings/EWall.h
	gamemodel/entities/units/EArcher.h
	gamemodel/entities/units/EBallista.h
	gamemodel/entities/units/EBatteringRam.h
	gamemodel/entities/units/ECanon.h
	gamemodel/entities/units/ECatapult.h
	gamemodel/entities/units/ECavalry.h
	gamemodel/entities/units/EInfantry.h
	gamemodel/entities/units/EPawn.h
	gamemodel/entities/units/EPikeman.h
	gamemodel/entities/units/ESiegeTower.h
Merge branch 'gamemodel' into network

Conflicts:
	gamemodel/actions/ARecruit.h
	gamemodel/entities/ELocation.cpp
Added ASetAP and ASetTurn support
save
forget this.
merged network and gamemodel