Added new tests for Battle
Merge with trunk
Added basic functionality to hit combatants
Added BattleAction