fix model, change layout of mo_site
Merge branch 'master' of https://github.com/CreativeMediaWorkshop/CreativeMediaWorkshop

Conflicts:
	app/assets/javascripts/application.js