made video optional
Merge branch 'master' of github.com:glg/musite

Conflicts:
	lib/siteModel.js