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

Conflicts:
	SchulPlan/gen/g18/group5/schulplan/R.java
	SchulPlan/res/layout/activity_main.xml
	SchulPlan/src/g18/group5/schulplan/MainActivity.java