mbs-6564: adding comment to areas, pt 1
Merge branch 'schema-changes-2013-10-15' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6564
mbs-6564: comments for areas pt 2
mbs-6564: add indexes for area comments
mbs-6564: adding comment to the XML ws
mbs-6564: Adding area comment to the JSON serialiser
mbs-6564: removing unique index, adding whitespace constraint
mbs-6564: add disambiguation to edit display
mbs-5701: add video flag to recordings (SQL)
Merge branch 'mbs-6200-ws' of https://bitbucket.org/reosarevok/musicbrainz-server into mbs-5701

Conflicts:
	upgrade.sh
mbs-5701: adding video flag to recordings (UI + WS)
mbs-5701: first draft for displaying video icon on tracklists
mbs-5701: video flag display on tracklists
fixing trailing comma
mbs-5701: moving the video image to a better place
mbs-6564: fix historical + comment
mbs-5701: move other places to use the video icon
mbs-5701: add video-only option to artist's recording tab
mbs-5701: changing wording of image title to be more clear
mbs-5701: bundling the video flag with ian's rewrite of the recording table to save upgrade time