Refactor role management — Separating mailout role code from general role code
Update some text
Merge branch 'master' into unimelb