+ controller refactor changes
+ fix for eyedraw import code
+ controller refactor changes
RBAC.
Merge branch 'feature/rbac' into develop