Merge branch 'hotfix/0.7.0.5'
Merge branch 'hotfix/0.7.0.5' into develop

Conflicts:
    Gemfile.lock
    locale/cy/app.po
    locale/fr/app.po
    locale/he_IL/app.po
    locale/id/app.po
    locale/pt_BR/app.po
    locale/ro_RO/app.po
    locale/sr@latin/app.po
    locale/uk/app.po
Merge branch 'release/0.8'
Merge branch 'release/0.8'
Merge branch 'release/0.8' into develop

Conflicts:
    locale/he_IL/app.po
    locale/id/app.po
Follow alphabetical ordering.
Use full urls in outgoing_message_url as the name implies
When force_ssl is true make links in emails https
Merge remote-tracking branch 'openaustralia_github/email_alert_path_fixes' into hotfix/0.8.0.1
Merge remote-tracking branch 'openaustralia_github/https_in_emails' into hotfix/0.8.0.1
Merge branch 'hotfix/0.8.0.1' into wdtk