MBS-4868: Add link to view all alias from alias edits
Merge branch 'master' into mbs-4868-view-alias-link
MBS-4115, Schema changes for .png/.gif support.
Rename setup_test_db_for_selenium.pl → script/setup_development_db.pl.

Now that selenium tests have been removed, a script to set up a
database for selenium is no longer needed.  However, the script is
still useful as a general way to set up a minimal database.  I changed
it to operate on the production/development database instead of a test
database.
Add SQL update scripts which deduplicate tracklists.

This changes made by these scripts are:
  1. replace tracklist column in tracks with a medium column
  2. make copies of each track so a track is not re-used on multiple media
  3. add gid column to the track table and generate uuids for each track
  4. add track_gid_redirect table
MBS-5314: Drop the work.artist_credit column

This column has been long deprecated (and only contains NULL).
MBS-5302: ISNI support for artists and labels
Revert changes to caa/CreateViews.sql

This change does not pertain to this branch.
Fix tests
Reimplement merge strategy to be O(1) rather than O(n)
Add ON_ERROR_STOP 1 to the upgrade script
MBS-5528: Rename short_link_phrase to long_link_phrase
Update reduplicate tracklist sql changes + test data dump script.

- Also update tracks attached to a single tracklist in 20130220-reduplicate-tracklists.pl
- Also replace the track insert/delete triggers in 20130220-update-track-trigger.sql
- Output tracks in script/release-group-sql-dump.pl, and dump link tables in the correct order.
- Include some temporary scripts (resetdb.sh, cleandb.sh) useful during development of this branch.
MBS-5947: use track positions to ensure that if, for ACs, an unchanged track is between two tracks changed to the same thing, it displays as two separate ranges when collapsed
Making sure BBC Music artist links are for an artist page
Merge branch 'master' of https://bitbucket.org/reosarevok/musicbrainz-server into mbs-4894

Conflicts:
	root/static/scripts/tests/Control/URLCleanup.js
MBS-1839, Include work types in webservice test data dump.
MBS-5964: clear the cache for artist credits after artists would be deleted from the cache
MBS-799/5919: basic start on table creation and migration for areas
MBS-5841: split the '(none)' string by context