roles enpoint has been wired - refactored from user_roles
Merge remote-tracking branch 'upstream/master'
Merge pull request #261 from akintolga/master

Renamed user_roles to roles