video drawer moved up
Merge branch 'master_collection_add_page' of https://github.com/digitalgreenorg/dg into master_collection_add_page

Conflicts:
	dg/templates/social_website/collection_add.html
Merge branch 'master_collection_add_page' of https://github.com/digitalgreenorg/dg into master_collection_add_page

Conflicts:
	dg/media/social_website/scripts/app/views/collection-add-dropdown.html
	dg/templates/social_website/collection_add.html
working copy