design anpassungen
Merge branch 'master' of https://github.com/arkan85/FHKRoutenplaner.git
Merge branch 'master' of https://github.com/arkan85/FHKRoutenplaner.git

Conflicts:
	src/de/damianbuecker/fhkroutenplaner/activity/NavigationActivity.java
Merge branch 'master' of https://github.com/arkan85/FHKRoutenplaner.git