Merge branch 'hotfix/0.7.0.5'
Merge branch 'release/0.8'
Merge branch 'release/0.8'
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 rails-3-develop

Conflicts:
    config/environment.rb
    spec/mailers/track_mailer_spec.rb