Add indexes on application.owner and editor_oauth_token.editor
Split the upgrade script
The application.owner index should not be unique
Fix "overriding" of methods from a role
Merge branch 'beta'

* beta: (98 commits)
  Update translations from transifex.
  MBS-5535, rename clean_text to collapse_whitespace.
  Valid HTML5 fixes, replace nbsp with numeric entity reference in common-macros.tt, display_age_ago.
  Valid HTML5 fixes to stastistics pages.
  Update iTunes match/cleanup to use https
  MBS-5523: Add test for JSON WS ?inc=url-rels.
  MBS-5523: Add missing "url" in JSON WS url-rels output.
  Fix the artist credit rendering function, add test
  MBS-4578: change sample to use schema 16 as well
  MBS-4578: update to current beta
  Silence complaints about trailing commas
  Update .pot files
  i18n: N_ functions didn't get re-added to the Makefile, evidently
  MBS-5509: deduplicate cookie generation/refreshing
  MBS-5535, correctly collapse and trim all parts of an artist credit in Edit::Utils::clean_submitted_artist_credits.
  Always render disambiguations as string (never as json null), update json /ws/2 webservice BrowseWorks test.
  Always render disambiguations as string (never as json null) and include them in works (json /ws/2 webservice).
  Do not show 'and vote' on the note/vote submit button for closed edits
  MBS-5509: set cookie expiration at a year, and re-set the cookie regularly
  MBS-5492: get rid of iso_code_for_display, fixing i18n and some special-casing too
  ...
"about" is not a valid HTML5 attribute, but we still use it for RDFa.  For now, ignore the invalid html5 error messages from the validator about this.
Ignore bad values for 'resource' attributes in HTML5 tests
Merge branch 'beta'

* beta:
  Ignore bad values for 'resource' attributes in HTML5 tests
  "about" is not a valid HTML5 attribute, but we still use it for RDFa.  For now, ignore the invalid html5 error messages from the validator about this.
MBS-5576: Fix colspan
Remove middle-man add and edit templates
OTHER-127: Point sponsor link to MetaBrainz
Merge branch 'master' into mbs-5265

* master: (114 commits)
  Ignore bad values for 'resource' attributes in HTML5 tests
  "about" is not a valid HTML5 attribute, but we still use it for RDFa.  For now, ignore the invalid html5 error messages from the validator about this.
  Update translations from transifex.
  MBS-5535, rename clean_text to collapse_whitespace.
  Valid HTML5 fixes, replace nbsp with numeric entity reference in common-macros.tt, display_age_ago.
  Valid HTML5 fixes to stastistics pages.
  Update iTunes match/cleanup to use https
  MBS-5523: Add test for JSON WS ?inc=url-rels.
  MBS-5523: Add missing "url" in JSON WS url-rels output.
  Fix the artist credit rendering function, add test
  MBS-4578: change sample to use schema 16 as well
  MBS-4578: update to current beta
  Silence complaints about trailing commas
  Update .pot files
  i18n: N_ functions didn't get re-added to the Makefile, evidently
  MBS-5509: deduplicate cookie generation/refreshing
  MBS-5535, correctly collapse and trim all parts of an artist credit in Edit::Utils::clean_submitted_artist_credits.
  Bump DB_SCHEMA_SEQUENCE from 15 to 16.
  Always render disambiguations as string (never as json null), update json /ws/2 webservice BrowseWorks test.
  Always render disambiguations as string (never as json null) and include them in works (json /ws/2 webservice).
  ...

Conflicts:
	lib/MusicBrainz/Server/Controller/Release.pm
	lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm
	lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm
	lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm
Merge branch 'master' into mbs-4627

* master: (657 commits)
  Ignore bad values for 'resource' attributes in HTML5 tests
  "about" is not a valid HTML5 attribute, but we still use it for RDFa.  For now, ignore the invalid html5 error messages from the validator about this.
  Update translations from transifex.
  MBS-5535, rename clean_text to collapse_whitespace.
  Valid HTML5 fixes, replace nbsp with numeric entity reference in common-macros.tt, display_age_ago.
  Valid HTML5 fixes to stastistics pages.
  Update iTunes match/cleanup to use https
  MBS-5523: Add test for JSON WS ?inc=url-rels.
  MBS-5523: Add missing "url" in JSON WS url-rels output.
  Fix the artist credit rendering function, add test
  MBS-4578: change sample to use schema 16 as well
  MBS-4578: update to current beta
  Silence complaints about trailing commas
  Update .pot files
  i18n: N_ functions didn't get re-added to the Makefile, evidently
  MBS-5509: deduplicate cookie generation/refreshing
  MBS-5535, correctly collapse and trim all parts of an artist credit in Edit::Utils::clean_submitted_artist_credits.
  Bump DB_SCHEMA_SEQUENCE from 15 to 16.
  Always render disambiguations as string (never as json null), update json /ws/2 webservice BrowseWorks test.
  Always render disambiguations as string (never as json null) and include them in works (json /ws/2 webservice).
  ...

Conflicts:
	admin/sql/updates/20120919-caa-edits-pending.sql
	lib/MusicBrainz/Server/Controller/Release.pm
	lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm
	lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm
	lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm
	upgrade.sh
MBS-5477: remove use of iso_code_for_display, conflicting tickets in last release
MBS-4627, use DBDefs-> instead of DBDefs:: in Entity::Artwork.
MBS-4627, use DBDefs-> instead of DBDefs:: in Entity::Artwork.
MBS-5265, perl 5.10 fix in Edit::ReleaseGroup::SetCoverArt.
Remove unneeded column
MBS-3072, "life-span" should not be omitted from the /ws/2 json output when empty.
MBS-3072, "length" should not be omitted from the /ws/2 json output when empty.