zwischenschritt
zwischenstand
Merge branch 'zacki' into development

Conflicts:
	lib/MysqlAdapter.php
	view/event/EventShowView.php