небольшие изменения по началу битвы
Merge branch 'master' of github.com:kewgen/regolith

Conflicts:
	client/src/com/geargames/regolith/awt/components/battles/PBattlesPanel.java