temporary
Merge branch 'development' of github.com:kewgen/aow into development

Conflicts:
	release/common.jar
	release/server.battle.jar
	release/server.jar
	release/server.main.jar
	release/start.battle.sh
	release/util.jar