BattleActivity finalized

The battle activity is finished for wednesday. all activities should
call the BattleActivity and not the BattleTestActivity