mbs-6211: add ended to alias tables
mbs-6211: adding update file
Merge branch 'schema-changes-2013-10-15' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6211
mbs-6211: upgrade.sh
mbs-6211: adding triggers
mbs-6211: putting columns at the end of the tables
mbs-6211: run generate for the triggers
Merge branch 'schema-changes-2013-10-15' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6211
Merge branch 'schema-changes-2013-10-15' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6211

Conflicts:
	admin/sql/DropTriggers.sql
	postgresql-musicbrainz-collate
	postgresql-musicbrainz-unaccent
Merge branch 'mbs-6211' of https://bitbucket.org/reosarevok/musicbrainz-server into mbs-6211-ui
mbs-6211: add ended to alias (I)
mbs-6211: reordering sql so it doesn't complain
Merge branch 'mbs-6211' of https://bitbucket.org/reosarevok/musicbrainz-server into mbs-6211-ui
mbs-6211: finish adding ended to aliases
Merge branch 'master' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6211-ui
mbs-6211: fixing some tests
Merge branch 'schema-changes-2013-10-15' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6211-ui

Conflicts:
	lib/MusicBrainz/Server/Data/Alias.pm
	upgrade.sh
Merge remote-tracking branch 'reosarevok-bitbucket/mbs-6211-ui' into schema-changes-2013-10-15

* reosarevok-bitbucket/mbs-6211-ui:
  mbs-6211: fixing some tests
  mbs-6211: finish adding ended to aliases
  mbs-6211: reordering sql so it doesn't complain
  mbs-6211: add ended to alias (I)
  mbs-6211: run generate for the triggers
  mbs-6211: putting columns at the end of the tables
  mbs-6211: adding triggers
  mbs-6211: upgrade.sh
  mbs-6211: adding update file
  mbs-6211: add ended to alias tables
Reorder upgrade.sh for consistency.