Cleanup commit for merge
Merge branch 'master' of https://github.com/lbondaryk/PlayerProto

Conflicts:
	js/widget-slider.js
Merge remote-tracking branch 'upstream/master'
Add in CSS and HTML for new layouts that are going into Habitat
Merge pull request #85 from antelopeb/master

New layout methodology being used for the SanVan content