#465 - Integrate User and Roles
Merge pull request #270 from Nurhashimah/master

#465 - Integrate User and Roles