Setting permissions based on role and adding additional roles.
Merge branch 'access' into development