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

Conflicts:
	src/de/damianbuecker/fhkroutenplaner/activity/StartUpActivity.java
	src/de/damianbuecker/fhkroutenplaner/databaseaccess/DatabaseHelper.java
	src/de/damianbuecker/fhkroutenplaner/model/HistoryItem.java
	src/de/damianbuecker/fhkroutenplaner/model/Model.java
Merge branch 'master' of https://github.com/arkan85/FHKRoutenplaner.git