int  getEntityType() -> abstract int getEntityType()
Merge branch 'development' of github.com:kewgen/aow into development

Conflicts:
	release/common.jar
	release/conjunction.jar
	release/server.battle.jar
	release/server.jar
	release/server.main.jar
	release/util.jar
java -> c#
ClientBattleAlliance has been updated manually