Implemented cart update
Merge branch 'master' of git://github.com/isics/IsicsOpenMiamMiamBundle

Conflicts:
	Controller/CartController.php
	Controller/CatalogController.php
	Resources/config/services.yml
	Resources/views/Catalog/showCategory.html.twig