add roles to users
Merge branch 'add-roles'