Merge branch 'better.logging' into development

Conflicts:
	release/common.jar
	release/conjunction.jar
	release/server.battle.jar
	release/server.jar
	release/server.main.jar
	release/server/data/ab.dat
	release/util.jar