Completed RoleService
Merge branch 'stable'