Merge branch 'master' of http://cascardo.info/eventmanager/