Adding descriptions to collections
Removing unused preview bit
Preparing schema change branch for 2013-05-15
MBS-4756/MBS-5918: transclusion -> DB, main UI fixes. tests and migration script needed still
MBS-4756/MBS-5918: update tests to reflect new wikidocs system in DB
MBS-4756/MBS-5918: create a migration script reading in the old disk-based transclusion table and inserting into the DB
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
MBS-4756/MBS-5918: corrections to index migration code recommended by ocharles, plus documentation of race condition
MBS-4756/MBS-5918: add transclusion table migration to upgrade.sh