Remove unnecessary test file (to prevent conflicts)
Remove youtube plugin from merge
Merge branch 'master' into creative-commons-images

Conflicts:
	test.html