Closed #128
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/de/tum/in/tumcampus/activities/wizard/WizNavExtrasActivity.java
	app/src/main/java/de/tum/in/tumcampus/auxiliary/ImplicitCounter.java
	app/src/main/java/de/tum/in/tumcampus/trace/ExceptionHandler.java
Merge