Add ordering columns to CreateTables, also add an upgrade script
Merge remote branch 'origin/beta' into ordering-cols
Remove code for recording types because recordings don't have types
Add code support for ordering columns (etc)
Extract attribute descriptions for translation
Merge remote branch 'origin/beta' into ordering-cols

Conflicts:
	lib/MusicBrainz/Server/Controller/RelationshipEditor.pm
	lib/MusicBrainz/Server/Controller/ReleaseEditor.pm
Fix ISE caused by a mistake in fixing the merge conflicts, fix work types list in the relationship editor
Remove commented out lines which snuck in
Merge remote branch 'origin/schema-change-2014-05' into ordering-cols
Put "Other" last for cover art types
Add foreign keys for parent columns
Remove area sortnames
Add 20140308-ordering-columns-fk.sql to the upgrade script
Actually implement the support for ordering/tree stuff for cover art types
Merge remote branch 'origin/beta' into ordering-cols

Conflicts:
	lib/MusicBrainz/Server/Entity/WorkAttributeType.pm
	lib/MusicBrainz/Server/Form/Work.pm
	po/extract_pot_db
Revert incorrect changes to Edit/Area/Create.pm
Remove label sortnames
Removing accidentally committed commented out line
Merge remote branch 'origin/schema-change-2014-05' into remove-area-sortnames

Conflicts:
	root/area/layout.tt
	upgrade.sh
Merge branch 'remove-area-sortnames' into remove-label-sortnames

Conflicts:
	root/label/layout.tt