Merge origin/master
Formulare
Umlaute
Formulare
Umlaute
Merge origin/master

Conflicts:
	web/admin/list_student.jsp
Merge origin/master