Work on moving roles model to roles and permissions
Work on roles & permissions
Merge branch 'feature/roles-and-permissions' into feature/cluster