Revert "commit"

This reverts commit 3240035c9c1cdbedafb9ed4a0c68be463343dc9e.

Conflicts:
	Model/ShoppingCart.php
	View/viewCart.php