Merge pull request #2 from emmairwin/7.x-dev

Core: updated with updated Role Names, and default permissions