fixed
Merge branch 'master' of https://github.com/uzuzjmd/UnterrichtMe

Conflicts:
	UnterrichtMeProjekt/web/jsp/index.jsp
änderungen fertigfixen