Battle Activity & BattleController changed, Player changed
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	gen/de/ur/mi/android/excercises/starter/R.java