Get started with new Battle system and switch to sharedPref for a couple of things.
Merge remote-tracking branch 'origin/master'