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.
Add a configuration option to specify that you don't want the default locale to appear in URLs generated by the application.
Merge branch 'feature/no-default-locale-in-routes' into develop
Use generated URLs in help pages - then they're accessible to routing filters etc.
Correct help unhappy path.
Give the implicit default locale in a URL without locale precedence over the session in the case where the default locale is not being included in URLs. This allows the user to return to the default locale.
Merge branch 'feature/no-default-locale-in-routes' into develop
Move styling of popup close buttons to stylesheet so they can be more easily overriden by themes.
Use generated urls so that they go through locale filters.
Use Rails.env as a more reliable way of determining environment - it may not have come from ENV.
Standardize slug generation for external users so that it uses the same underlying method as other slug generation. Fixes #567.