bla
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	bin/UnimonApp.apk
	bin/classes.dex
	bin/resources.ap_
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	bin/UnimonApp.apk
	bin/resources.ap_
	gen/de/ur/mi/android/excercises/starter/R.java
	src/de/ur/unimon/actionbar/InventoryActivity.java
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	bin/UnimonApp.apk
	bin/resources.ap_
	src/de/ur/unimon/actionbar/InventoryActivity.java
DompteurActivity + BattleLogic