Merge uApprove role into the IdP role

Resolves #102