WIP: Shop Styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	cctheme/css/_shop.scss
WIP: Shop Styles