test
Merge remote-tracking branch 'origin/master'

Conflicts:
	FitFritz/app/src/main/java/ferienakademie/de/fitfritz/controller/DatabaseHandler.java
StartScreen deleted