Add fallbacks to release group types in /ws/2, in accordance with http://wiki.musicbrainz.org/User:Wizzcat/Type_Migration
Merge branch 'mbs-3646' into schema-change-2012-05-15

* mbs-3646:
  Add fallbacks to release group types in /ws/2, in accordance with http://wiki.musicbrainz.org/User:Wizzcat/Type_Migration
  Match terminology on edit pages and the display of edits themselves
  Fix the display of release groups with no primary type
  Make sure editing a release group but not changing the type does not clear the release group type
Merge branch 'schema-change-2012-05-15' of ssh://localhost:10015/musicbrainz-server into schema-change-2012-05-15

* 'schema-change-2012-05-15' of ssh://localhost:10015/musicbrainz-server:
  MBS-2532, IPI role missing from Artist form.
Merge branch 'mbs-4337' into schema-change-2012-05-15

* mbs-4337:
  Hide homepage and biography on user pages if they are not set
  Use a right margin instead of an &nbsp; entity to add space after the gravatar
  Remove whitespace around a users language list
  Sort an editors languages by fluency and then by name
  Let users know what we will use their birth date for
  Load editor preferences in a few more places
  Filter the edit profile language list to match the language list in the release editor

Conflicts:
	lib/MusicBrainz/Server/Form/ReleaseEditor/Information.pm
	lib/MusicBrainz/Server/Form/Utils.pm
MBS-1385: Add database DDL changes to support unknown end dates
Add constraints for the 'ended' invariant

The ended invariant states that for any row that has any end date fields, the
'ended' attribute is true.
Add the 'ended' attribute to the object model
Display unknown end dates for artists and labels
Display relationships with unknown end dates
Merge branch 'mbs-1385' into schema-change-2012-05-15

* mbs-1385:
  Display relationships with unknown end dates
  Display unknown end dates for artists and labels
  Add the 'ended' attribute to the object model
  Add constraints for the 'ended' invariant
  MBS-1385: Add database DDL changes to support unknown end dates
  MBS-4664: Fix invalid syntax in DBDefs.pm.default

Conflicts:
	admin/sql/CreateFunctions.sql
	upgrade.sh
Add 'ended' checkbox to forms with begin/end dates
Fix editing relationships to have the 'ended' attribute
Support creating and editing labels and artists end dates
Merge branch 'mbs-1385' into schema-change-2012-05-15

* mbs-1385:
  Support creating and editing labels and artists end dates
  Fix editing relationships to have the 'ended' attribute
  Add 'ended' checkbox to forms with begin/end dates

Conflicts:
	lib/MusicBrainz/Server/Data/Artist.pm
	lib/MusicBrainz/Server/Data/Label.pm
	lib/MusicBrainz/Server/Edit/Artist/Create.pm
	lib/MusicBrainz/Server/Edit/Artist/Edit.pm
	lib/MusicBrainz/Server/Edit/Label/Create.pm
	lib/MusicBrainz/Server/Edit/Label/Edit.pm
	lib/MusicBrainz/Server/Form/Artist.pm
	lib/MusicBrainz/Server/Form/Label.pm
Add release_group_secondary_type_join to replication
Merge branch 'mbs-3646' into schema-change-2012-05-15

* mbs-3646:
  Add release_group_secondary_type_join to replication
Add artist_ipi and label_ipi to replication
Add artist_ipi and label_ipi to import and export
Merge branch 'mbs-2532' into schema-change-2012-05-15

* mbs-2532:
  Add artist_ipi and label_ipi to import and export
  Add artist_ipi and label_ipi to replication
Add release_group_secondary_type_join to import and export