CART :: Minor Cart Edits
Merge branch 'master' of https://github.com/miguelpelota/n48

Conflicts:
	app/models/Cart.php