Branding: fix console link
Branding: Fix guide links on login error page

Fix guide links on login error page to match the correct ones used on
the "troubles" section on the welcome page.
Branding: removed extra space from email.gsp
Merge pull request #134 from University-of-Auckland/aaf-develop

Branding: fix console link
Merge pull request #135 from University-of-Auckland/aaf-branding-url-fix

Aaf branding url fix
Merge branch 'aaf-develop' into code-develop
Merge commit '13b271fa59c1a4309b4db1962cff27c5076d7093' into tuakiri-develop
Merge branch 'code-develop' into tuakiri-develop

Conflicts resolved (keep Tuakiri version for both):
	branding/grails-app/i18n/messages-branding.properties
	branding/grails-app/views/layouts/email.gsp
TuakiriBranding: replace logo and adjust branding

* Replace logo with Tuakiri-logo-FR-310x82.jpg
* Adjust image size in _frheader.gsp
* Adjust font size for H1 and H2 from 1.4em to 2.5em
  to match font size in the new logo
Merge branch 'tuakiri-develop'