Rename roles to 'editor' and 'user-admin'.
Merge branch 'master' of github.com:Code4SA/pmg-cms-2