Add adding roles on add user. Switch to edit user
Merge branch 'feature/roles' into develop