admin mode
Merge branch 'master' of https://github.com/dreanor/androidwebapp.git

Conflicts:
	SchulPlan/src/g18/group5/schulplan/MenuActivity.java
a<ehae