User Roles changes
Merge branch 'master' of https://github.com/VikingOrg/viking
Merged