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

Conflicts:
	SchulPlan/bin/SchulPlan.apk
	SchulPlan/bin/classes.dex
	SchulPlan/bin/resources.ap_
	SchulPlan/gen/g18/group5/schulplan/R.java