* 'master' of https://github.com/thelia/thelia: (121 commits)
set cartItem in cart add and update events
need to unescape breadcrumb strings after been in array
update readme file
update insert.sql with new release version
change changelog file format
Prevent product and content création at catalog root
dynamic delivery modules on delivery front template
complete changelog
Finished merging modules with master
Revert "Merge branch 'cleanmaster' into modules"
use TaxEngine::getDeliveryCountry in delivery loop
refacto getTaxCountry which is actually getDeliveryCountry
make it magic last stand
change loop in shipping zone template using module insteadof delivery
Fixed template loop
Refactored templates processing
complete readme file
change email address of core contributors
fix getPosition folder test
add coupon tests
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
* 'master' of git://github.com/thelia/thelia:
Check if store_country has a value
Fixed double '/' in generated assets URLs
Add validation for Store configuration
Use Store contact information
Call the wrong AdminResources in saveAction
Action buttons smaller
Replace company_name and contact_email by store_name & store_email
Add a new admin page to manage the basic store configurations
Add routing for Store Configuration
Add argument Title on Content Loop & Folder Loop
* 'master' of git://github.com/thelia/thelia:
undo removing Response::prepare call
HttpCache can not be activated as default
remove specific code testing esi integration
create smarty tag for smarty renderer
remove Thelia ResponseListener
add new route for testing esi tag
tweak httpFoundation cache part for compatibility with Thelia\HttpFoundation part
add httpcache into index_dev.php file
start using symfony 2 reverse proxy
update wiki url in composer file
create smarty tag for smarty renderer
remove Thelia ResponseListener
add new route for testing esi tag
Added some translations in the Customer Creation Form
tweak httpFoundation cache part for compatibility with Thelia\HttpFoundation part
add httpcache into index_dev.php file
start using symfony 2 reverse proxy
