code cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	Content/styles/page.css
	scss/_spriting.scss
	scss/page.scss