removed conference, added events
Merge pull request #311 from owncloud/confcleanup

removed conference, added events