+ base event type controller refactor
+ comment updates
RBAC.
Merge branch 'feature/rbac' into develop