an improvment for the greater good
Merge branch 'master' of https://github.com/jamer/be

Paul's changes were really good
Conflicts:
	BattleEngine.xml