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

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/FHKRoutenplaner.apk
	bin/classes.dex
	bin/resources.ap_
	src/de/damianbuecker/fhkroutenplaner/activity/ModifiedActivity.java
Merge branch 'master' of https://github.com/arkan85/FHKRoutenplaner.git
Merge branch 'master' of https://github.com/arkan85/FHKRoutenplaner.git