Added roles to token
Moved role types to user class
Added user roles
Renamed GetRoles to GetRole
Merge branch 'feature/grantb/roles' into develop