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

Conflicts:
	SchulPlan/bin/dexedLibs/android-support-v4-c512f3655da96a4d8337a39def294140.jar
	SchulPlan/gen/g18/group5/schulplan/R.java
	SchulPlan/res/layout/activity_stundenplan.xml