Merge pull request #127 from University-of-Auckland/aaf-develop

Branding: move AAF mentions from GSP to messages