Merge branch '005-add-roles-to-users' into develop
Review
Merge pull request #1 from henb/develop

Develop