Adding descriptions to collections
Removing unused preview bit
Preparing schema change branch for 2013-05-15
Fix merge conflict, add tests etc
Merged metabrainz/musicbrainz-server into master
Merged master into mbs-4294
Remove carton.lock from diff
Merge branch 'mbs-4294' of https://bitbucket.org/reosarevok/musicbrainz-server into mbs-4294
Add the upgrade.sh stuff
Merge remote branch 'origin/schema-changes-2013-05-15' into mbs-4294

Conflicts:
	upgrade.sh
Add the stuff to upgrade.sh
Trying to get this to merge
Merge branch 'schema-changes-2013-05-15' of git://github.com/metabrainz/musicbrainz-server into mbs-4294

Conflicts:
	upgrade.sh
Trying to stop it conflicting. Again.
Merge branch 'schema-changes-2013-05-15' of git://github.com/metabrainz/musicbrainz-server into mbs-4294
Merge remote-tracking branch 'reosarevok-bitbucket/mbs-4294' into schema-changes-2013-05-15

* reosarevok-bitbucket/mbs-4294:
  Trying to stop it conflicting. Again.
  Trying to get this to merge
  Add the stuff to upgrade.sh
  Add the upgrade.sh stuff
  Remove carton.lock from diff
  Preparing schema change branch for 2013-05-15
  Removing unused preview bit
  Adding descriptions to collections