Index: Updated CSS and HTML
Merge branch 'master' into mix-and-match-master

Conflicts:
	app/styles/vars.less