Merge pull request #7 from jerv13/master

REF-53 - Role property re-factor
Merge pull request #8 from jerv13/master

REF-92 - Update for user role management
Merge pull request #9 from jerv13/master

REF-92 - Updates for admin screens and bug fixes
Merge pull request #10 from jerv13/master

REF-92 - Update ACL logic and validations, removed resource id parsing
Merge remote-tracking branch 'upstream/master'