updated eventtypes, controllers
Merge branch 'master' of http://github.com/k-may/kevmayo-current