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

Conflicts:
	src/de/damianbuecker/fhkroutenplaner/activity/DisplayMapsActivity.java
	src/de/damianbuecker/fhkroutenplaner/controller/NfcController.java