add/remove role to user/permission
Merge branch 'userroles' into development
fixed conflicts, added organization to user controller
rest api cleanup
work in progress