bugfix nullpointer exception
Merge branch 'develop' of https://github.com/ketsching/MobileComputing-Semesteraufgabe into develop
Merge branch 'develop' of https://github.com/ketsching/MobileComputing-Semesteraufgabe into develop
Model und LocationList update
Merge branch 'develop' of https://github.com/ketsching/MobileComputing-Semesteraufgabe into develop

Conflicts:
	src/fhfl/jhjjjkmp/semesteraufgabe/FragmentMain.java
	src/fhfl/jhjjjkmp/semesteraufgabe/Model.java