Merge branch 'master', remote-tracking branch 'origin'
Use upstream globalize.

We're trying to switch to an upstream version of globalize, which now
has Henare's change to allowed blank values without them being
converted to nil - however, there is another intermediate change that
was introduced which means that the name is only written back to the
original table if the locale matches the default locale.  This is
described in more depth here:

   globalize/globalize#183

This change broke the make_single_language_example helper, but this
commit fixes that by also setting the default locale before creating
the example public bodies.
Update commonlib to include Alaveteli support in install-site.sh
Insert cookie stripping at correct point in middleware stack.
Session keys are stored as strings in Rails 3.

Update our session-stripping code.
Upgrade i18n to get fix for CVE-2013-4492.
Set enforce_available_locales to false

This was the previous behaviour. Setting it explicitly avoids a
deprecation warning.
Apply monkey patch for CVE-2013-6414.
Merge branch 'hotfix/0.15.0.2' into wdtk

Conflicts:
    Gemfile