Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main-cart.css
	css/main.css
	css/styleguide.css