Match column ordering in upgrade.sh with CreateTables.sql
Merge branch 'master' into schema-changes-2013-05-15
Merge branch 'column-ordering' into schema-changes-2013-05-15

* column-ordering:
  Match column ordering in upgrade.sh with CreateTables.sql
MBS-1839, drop constraint IF EXISTS in 20130318-track-mbid-reduplicate-tracklists.sql
MBS-799/MBS-5920: hacks to make releases load semi-correctly, plus updating label edit types
MBS-799/MBS-5920: fix Edit Label display
MBS-799/MBS-5920: fix up artist add/edit edits
Merge branch 'schema-changes-2013-05-15' into mbs-799-ui-5920