Merge pull request #284 from shenrie/master

Refactored Org Resource and Governance to use internal governance field
Changed UserRole to use internal field for governance