remove extra imports ocharles pointed out
Merge remote-tracking branch 'origin/split-domains'

* origin/split-domains:
  fix i18n link expander test
  fix ISE
  Unset a bunch of environment variables first.
  spelling web_set_locale correctly does help
  changes based on nikki's comment that the first make step was unnecessary (make install does that)
  capitalization error
  add documentation to INSTALL.md
  MBS-4241: Locale::Util's web_set_locale, and MBS-4223: regex.
  Switch out all the MB::S::Translation packages to use a role.
  Changes based on ocharles' comments (part 1)
  Add or update translations in various places.
  Modify various Entities to account for domains.
  Add other translation domains, and rewire infrastructure.
  Make necessary changes to generate new domains' .pot files.

Conflicts:
	root/release_group/index.tt
Merge remote-tracking branch 'origin/mbs-2387'

* origin/mbs-2387:
  MBS-2387: Intelligently merge release labels by discarding release labels with no catalog label when possible
Merge remote-tracking branch 'origin/mbs-4905'

* origin/mbs-4905:
  MBS-4905: Make sure work language is always loaded on work pages
Merge remote-tracking branch 'origin/mbs-4871'

* origin/mbs-4871:
  Lower-case all GIDs that are generated
Merge remote-tracking branch 'origin/mbs-4873'

* origin/mbs-4873:
  Tests to check that links on collections page is correct
  Provide a link to a user's collection
Merge remote-tracking branch 'ianmcorvidae/mbs-3156-slave-readonly'

* ianmcorvidae/mbs-3156-slave-readonly:
  ocharles' suggestions
  Final fixes to Context.
  try a different way
  fix
  attempt to fix
  Use the READONLY database when DBDefs::REPLICATION_TYPE is RT_SLAVE
MBS-3208, trim missing entity fields before creating their Add edits.
Merge remote-tracking branch 'ianmcorvidae/mbs-4741-voting-icons'

* ianmcorvidae/mbs-4741-voting-icons:
  MBS-4741: bring back voting indicators   * Add a colored border to the gravatar images   * Add some icons from famfamfam silk, as before   * Remove old icons, fix attribution
Merge remote-tracking branch 'ianmcorvidae/mbs-4875-stats-tabs-trans-plus-editor'

* ianmcorvidae/mbs-4875-stats-tabs-trans-plus-editor:
  make statistics tabs translatable
  Recompute editor statistics in cron jobs
  Add a note about only yes/no votes being counted
  Add rank indexes to the tables to be consistent
  Exclude bots from all the stats
  Use more consistent capitalisation
  Order top overall editors by a combination of accepted edits and auto edits
  Stats page should show a combination of accepted edits and auto edits
  Do not run CREATE INDEX CONCURRENTLY inside a transaction
  Cache the statistics as they are expensive to compute
  Add /statistics/editors
  Add methods to Statistics to find top editors/voters
Merge remote-tracking branch 'ianmcorvidae/mbs-4878-4613-release-editor-dropdowns'

* ianmcorvidae/mbs-4878-4613-release-editor-dropdowns:
  Fix Form::Utils::{language,script}_options to use l_name too
  change default accessor to l_name
Merge remote-tracking branch 'ianmcorvidae/mbs-4935-nreleases-calculation'

* ianmcorvidae/mbs-4935-nreleases-calculation:
  fix count.recording.Nreleases
Merge remote-tracking branch 'ianmcorvidae/mbs-4340-edit-i18n'

* ianmcorvidae/mbs-4340-edit-i18n:
  remove extra imports ocharles pointed out
  more fixes, apparently I'm typo-ridden tonight
  correct typo
  use l_edit_name where appropriate
  migrate all the edit types to use N_l, whether from l() or nothing. Add l_edit_name function to MB::S::Edit.
  add dummy N_l function that marks as translatable without actually translating
Merge remote-tracking branch 'ianmcorvidae/mbs-4857-timeline-resize'

* ianmcorvidae/mbs-4857-timeline-resize:
  MBS-4857: timeline graph resizing  * Add jquery.flot.resize.js and enable
Merge remote-tracking branch 'origin/mbs-4796'

* origin/mbs-4796:
  MBS-4796: Fix release groups with no types rendering incorrectly
Merge remote-tracking branch 'reosarevok/mbs-4888'

* reosarevok/mbs-4888:
  Adding the missing files, duh
  Add Trove to autoselect and sidebar
Merge remote-tracking branch 'origin/mbs-2903'

* origin/mbs-2903:
  MBS-2903: Fix Artist->find_by_work
Merge remote-tracking branch 'origin/mbs-4738'

* origin/mbs-4738:
  Add TEST database entry to DBDefs.pm.default.
  Make the default InitDb output a lot less chatty (this adds --verbose to get output similar to what was previously default).
  MBS-4738, create test database in create_test_db.sh.
  Change InitDb.pl to be able to initialize the test database. (carton exec -- admin/InitDb.pl --database=TEST --createdb --clean).
Merge remote-tracking branch 'origin/mbs-3904'

* origin/mbs-3904:
  MBS-3904: Do not allow yes/no/abstain votes on own edits
Merge remote-tracking branch 'origin/mbs-2765'

* origin/mbs-2765:
  MBS-2765, GuessCase Artist mode shouldn't operate with sentence caps.