pause/resume
Merge branch 'social_proto' of https://github.com/digitalgreenorg/dg into social_proto

Conflicts:
	dg/media/social_website/scripts/app/view-controllers/VideoAddController.js