Eventmodul
Merge branch 'master' of https://github.com/svensuch/tdh-murgtal into svensuch-master

Conflicts:
	dev/klickdummy/css/styles.css
Merge branch 'master' of github.com:jensgro/tdh-murgtal