Update Notifier 1
Merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	Vertretungsplan/src/de/gymdon/app/activities/MainActivity.java
	Vertretungsplan/src/de/gymdon/app/api/AllObject.java
Unfinished 2
Merge remote-tracking branch 'origin/master' into skyrising-dev

Conflicts:
	Vertretungsplan/res/values/strings.xml
	Vertretungsplan/src/de/gymdon/app/activities/MainActivity.java
	Vertretungsplan/src/de/gymdon/app/api/AllObject.java