changed user edit screen to use the users organization roles in the roles dropdown. Fixes #377. Added test for updating roles.