cart aids
Merge remote-tracking branch 'origin/luukie15' into luukie15

Conflicts:
	app/views/products/show.blade.php