Merge remote-tracking branch 'henare_github/patch-1'
Revert "Merge remote-tracking branch 'henare_github/patch-1'"

Mistakenly merged into master. Please note that we'll want to merge this work into master on the next release, at which point we'll want to revert this reversion in order that the changes are properly re-applied.

This reverts commit 54281fd50c3271835a54ab4bc08d40da09d643ee, reversing
changes made to 793ca358c37458e6cc4385d2366621aaee93a25e.
Latest translations from Transifex.
Revert "Revert "Merge remote-tracking branch 'henare_github/patch-1'""

This reverts commit 211fe84dc40d97df8aa8724906d9170ed4f78477.
Merge branch 'release/0.6.7'

Conflicts:
  locale/cs/app.po
  locale/ro_RO/app.po
Require rather than load to avoid already defined constant error when loading rails environment.
Latest translations from Transifex.
Merge branch 'hotfixes/translations0.6.7'
Merge remote-tracking branch 'origin/release/0.6.8'

Conflicts:
  locale/cs/app.po
  locale/sl/app.po
  locale/sq/app.po
  locale/tr/app.po
  locale/uk/app.po
Emphasise the importance of adding a newrelic.yml file, fix formatting.
Don't install rspec in production

Also don't need to explicitly specify the rspec gem as rspec-rails depends on it
Wrap specs on the extraction of RFC-822 headers in code that sets the ENV timezone. TMail renders headers using localtime, which is not ideal, but we're migrating away from it anyway, so I'm not sure it's worth delving into the internals of TMail to fix it.
Merge branch 'feature/set-zone-in-tests' into develop
Merge remote-tracking branch 'henare_github/rspec' into develop
Don't offer or allow viewing of an HTML version of a request if it is hidden, or requester_only. Google docs viewer won't be able to access it, and our own conversion process currently produces image files that will then be publicly viewable. If necessary we can revisit this code to enable admins and requesters to view the HTML version created by our own conversion without adding these files to a path that is served directly by the web server.
Reformat for line length, add the expected response code.
Don't offer or allow viewing of an HTML version of a response attachment if the request is hidden, or requester_only. Google docs viewer won't be able to access it, and our own conversion process currently can produce image files that will then be publicly viewable directly from the webserver (see config/httpd.conf). If necessary we can revisit this code to enable admins and requesters to view the HTML version created by our own conversion without adding these files to a path that is served directly by the web server.
Merge branch 'hotfix/no-html-conversion-for-hidden'
Merge branch 'hotfix/no-html-conversion-for-hidden' into develop
Restore rspec - causing errors on production deploy with cap.