add email field to create-user form template
Fix moderator permissions that were incorrectly assigned to the editor group
permission checks should not be prefixed with 'can_'
Merge branch 'develop'