preliminary v2 layout
merge new style with latest ocupop
merge new style with latest ocupop
Merge branch 'master' of https://github.com/mozilla/CSOL-site

Conflicts:
	static/media/css/core.css
	static/media/less/core.less
	views/layout.html
Merge pull request #268 from mgballard/master

Preliminary v2 theme