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

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/UnimonApp.apk
	bin/classes.dex
	bin/resources.ap_
	gen/de/ur/mi/android/excercises/starter/R.java
	res/layout/map_activity.xml
	src/de/ur/unimon/battle/BattleActivity.java
	src/de/ur/unimon/mapoverview/MapActivity.java