Included InfoActivity in Settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	Vertretungsplan/res/layout/preferences.xml
	Vertretungsplan/res/values/strings.xml
	Vertretungsplan/src/com/inf1315/vertretungsplan/LoginActivity.java
	Vertretungsplan/src/com/inf1315/vertretungsplan/PlanActivity.java
	Vertretungsplan/src/com/inf1315/vertretungsplan/SettingsFragment.java
Adapted settings texts to android guideline
Notification Cleanup
Changed token access
Corrected wrongly merged branch + added loadingDialog