joe
Merge remote-tracking branch 'origin/luukie15' into luukie15

Conflicts:
	public/js/cart.js