Make recording-work add relationship edits auto-edits (MBS-7944)
Update normalise_strings, add more tests for it (fixes MBS-7953 and MBS-1444)
mbs-7936: only create recordingEdits if there's an actual recording
Merge branch 'mbs-7936' into beta

* mbs-7936:
  mbs-7936: only create recordingEdits if there's an actual recording
Use components/*-list.tt when displaying merge edits
Don't compare the object type if it's undefined in Data::Area::load_containment
Fix my broken boolean
Fix release group tag text in tests that are failing.
Merge remote-tracking branch 'nikki-bitbucket/normalise_strings' into beta

* nikki-bitbucket/normalise_strings:
  Update normalise_strings, add more tests for it (fixes MBS-7953 and MBS-1444)
Merge remote-tracking branch 'nikki-bitbucket/templates-merging' into beta

* nikki-bitbucket/templates-merging:
  Use components/*-list.tt when displaying merge edits
Merge remote-tracking branch 'nikki-bitbucket/even-more-autoedits-2' into beta

* nikki-bitbucket/even-more-autoedits-2:
  Make recording-work add relationship edits auto-edits (MBS-7944)
Update .pot files.
Update translations from transifex.
Remove the entity-specific tags.tt files which were added in the schema change branch
Remove unneeded templates for events
Merge remote-tracking branch 'nikki-bitbucket/templates-schema-change-tags' into schema-change-2014-q4

* nikki-bitbucket/templates-schema-change-tags:
  Remove unneeded templates for events
  Remove the entity-specific tags.tt files which were added in the schema change branch
Merge branch 'beta' into schema-change-2014-q4