Mine laying updated
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/server/data/ab.dat
	release/server/data/stable/battle.jsn
	release/server/data/stable/en.locale
	release/server/data/stable/research.jsn
	release/server/data/stable/ru.locale
	release/server/data/stable/str_client.jsn
	release/util.jar