Staff and team member fixes.
Merge branch 'superuser-access' into develop