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