jiop
Merge branch 'test-state' of https://github.com/dominik1991jahn/tagebuchwebapp into test-state

Conflicts:
	Core/Classes/Teacher.php