dies und das
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/de/kaidev/vertretungsplanapp/MainActivity.java