Styling: Templates (footer, cart, category)
Controller: CartC. NavigationC.
nbproject/project.xml
Merge origin/master

Conflicts:
	DistSys/Symfony/src/DistSys/ShopBundle/Controller/NavigationController.php
	DistSys/Symfony/src/DistSys/ShopBundle/Resources/views/Scaffolding/header.html.twig