Reset focus on map after battle; New BattleView not created on each
instance
Merge remote-tracking branch 'Cody/master'
fixed setting inital pokemon in a battle