Fix to site admins not being allowed to edit attributes
Merge branch 'features/ajaxification' into develop