Added Settings and Infopage
Merge remote-tracking branch 'origin/master'

Conflicts:
	Vertretungsplan/res/values/strings.xml
	Vertretungsplan/src/com/inf1315/vertretungsplan/LoginActivity.java
	Vertretungsplan/src/com/inf1315/vertretungsplan/PlanActivity.java
Merge remote-tracking branch 'origin/master'