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

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

Conflicts:
	bin/UnimonApp.apk
	bin/classes.dex
	bin/resources.ap_
	src/de/ur/unimon/navigation/NavigationController.java
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	bin/resources.ap_
	src/de/ur/unimon/mapoverview/MapActivity.java
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	bin/classes.dex
	src/de/ur/unimon/mapoverview/MapActivity.java
bla
bla
Neue Unimons
Neue Trainer + RandomFights
Merge branch 'master' of https://github.com/neniman/unimon.git

Conflicts:
	bin/UnimonApp.apk
	bin/classes.dex
	bin/resources.ap_
	src/de/ur/unimon/battle/BattleActivity.java