battle fixes
Merge branch 'battle-test'

Conflicts:
	KingNThings/src/com/presenter/BattlePresenter.java
	KingNThings/src/com/presenter/BoardPresenter.java