Added cart functionality and minor layout improvements
Minor refactoring
Merge branch 'develop' into feature/ec-15-cart

Conflicts:
	app/jsx/components/app.js
	app/jsx/components/shop/_context.js