cart template
Merge branch 'template' of github.com:thelia/thelia into template
cart page
cart integration
cart integration
delivery process
Merge branch 'master' into template

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Feed.php
delivery process
fix fixture dependant unit test
order delivery form
delivery form
delivery process
Merge branch 'master' into template

Conflicts:
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Model/Base/Module.php
	core/lib/Thelia/Model/Base/ModuleQuery.php
	core/lib/Thelia/Model/Map/ModuleTableMap.php
	install/thelia.sql
	local/config/schema.xml