Merge "RoleManageController up"