When editors are not referenced by anything in the database, delete them for real instead of simply renaming.
Add options to parse only certain info (MBS-3730, MBS-3732)
mbs-7785: update ESTER treatment after the sites merged
Merge branch 'beta' into better-track-parser
Tweak appearance of track parser options
Set a text colour for input.error to avoid red text with a pink background
Whitespace
Fix wording of works with deprecated relationships report
Fix HTML typo and untranslatable string in the possible duplicate artists reports
Show whether you're subscribed to a collection on the collection overview (MBS-5925)
Merge branch 'beta' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-7785

Conflicts:
	root/static/scripts/edit/MB/Control/URLCleanup.js
Merge remote-tracking branch 'bitmap/better-track-parser' into beta

* bitmap/better-track-parser:
  Tweak appearance of track parser options
  Add options to parse only certain info (MBS-3730, MBS-3732)
Merge remote-tracking branch 'nikki-bitbucket/collections-show-subscribed' into beta

* nikki-bitbucket/collections-show-subscribed:
  Show whether you're subscribed to a collection on the collection overview (MBS-5925)
Merge remote-tracking branch 'nikki-bitbucket/misc' into beta

* nikki-bitbucket/misc:
  Fix HTML typo and untranslatable string in the possible duplicate artists reports
  Fix wording of works with deprecated relationships report
  Whitespace
  Set a text colour for input.error to avoid red text with a pink background
Merge branch 'real-deletion' into beta

* real-deletion:
  When editors are not referenced by anything in the database, delete them for real instead of simply renaming.
Merge remote-tracking branch 'reosarevok/mbs-7785' into beta

* reosarevok/mbs-7785:
  mbs-7785: update ESTER treatment after the sites merged
Update pot files using current code and production database.
Update translations from transifex.