implemented roles
solve merge conflict
Merge pull request #74 from cdcueva/roles

Roles