MBS-5434: Inconsistent terminology: primary/secondary types and type/extra types

http://tickets.musicbrainz.org/browse/MBS-5434

Choosing Primary / Secondary since that's what we call them internally and also in documentation: http://wiki.musicbrainz.org/Release_Group/Type