work on Roles so far
Merge pull request #2376 from dimagi/add_roles

work on Roles so far