initial event.php
content design event.php
Merge branch 'tobi' into DEVELOPMENT

Conflicts:
	css/style.css
did some changes in css