Commit of Switching Fixed
Swithed Shifting for real this time
Separated MapView and BattlView to each use own panel; battle in grass
Merge remote-tracking branch 'Joey/master'
Merge remote-tracking branch 'Joey/master'
merged with cody