Working on #128
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/de/tum/in/tumcampus/activities/UserPreferencesActivity.java
	app/src/main/java/de/tum/in/tumcampus/trace/ExceptionHandler.java