BattleActivity, BattleLogic, BattleController, battle_activity_xml,
Unimon um eine Methode erweitert;
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	gen/de/ur/mi/android/excercises/starter/R.java
	res/values/strings.xml
	src/de/ur/unimon/actionbar/Player.java