Merge branch 'master' of https://github.com/xploo/FHKRoutenplaner.git

Conflicts:
	res/layout/display_maps_activity.xml
	src/de/damianbuecker/fhkroutenplaner/activity/NavigationActivity.java
Merge branch 'master' of https://github.com/xploo/FHKRoutenplaner.git