Merge branch 'master' of https://bitbucket.org/metabrainz/musicbrainz-server
mbs-6882: make video page titles say video
Merge branch 'beta' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6882
mbs-6882: change this to be two strings as per Ian's request
Merge branch 'beta' of https://bitbucket.org/metabrainz/musicbrainz-server into mbs-6884
mbs-6884: remove title/artist centric bits from place guess case
mbs-6884: removing duplicate versus style
Merge remote-tracking branch 'reosarevok/mbs-6884' into beta
Merge remote-tracking branch 'reosarevok/mbs-6882' into beta