NavigationController, NavigationListener, PlayerPosition erstellt
NavigationController, NavigationListener, PlayerPosition erstellt

Conflicts:
	bin/UnimonApp.apk
	bin/classes.dex
	bin/resources.ap_
	gen/de/ur/mi/android/excercises/starter/R.java
	src/de/ur/unimon/actionbar/Player.java
	src/de/ur/unimon/mapoverview/MapActivity.java