working
Merge branch 'working' into dev

Conflicts:
	gulpfile.js
	public/js/components/cart/cart.js