remove tab users - if role is user
cleaned up user role stuff
Merge remote-tracking branch 'origin/work' into work