des mergens wegen
Merge branch 'master' of https://github.com/Willey1986/fsg-android

Conflicts:
	src/de/tubs/cs/ibr/fsg/activities/BriefingCheckInActivity.java
Merge branch 'master' of https://github.com/Willey1986/fsg-android