cleanup obsolete Event controller
Merge branch 'master' of github.com:fbierhaus/hackathon