Removed setContent() method, which is ununsed (an unusable)
Add relation between order and cart
	modified:   core/lib/Thelia/Model/Base/Cart.php
	modified:   core/lib/Thelia/Model/Base/CartQuery.php
	modified:   core/lib/Thelia/Model/Base/Currency.php
	modified:   core/lib/Thelia/Model/Base/Customer.php
	modified:   core/lib/Thelia/Model/Base/Lang.php
	modified:   core/lib/Thelia/Model/Base/Module.php
	modified:   core/lib/Thelia/Model/Base/Order.php
	modified:   core/lib/Thelia/Model/Base/OrderAddress.php
	modified:   core/lib/Thelia/Model/Base/OrderQuery.php
	modified:   core/lib/Thelia/Model/Base/OrderStatus.php
	modified:   core/lib/Thelia/Model/Base/OrderVersion.php
	modified:   core/lib/Thelia/Model/Base/OrderVersionQuery.php
	modified:   core/lib/Thelia/Model/Map/CartTableMap.php
	modified:   core/lib/Thelia/Model/Map/OrderTableMap.php
	modified:   core/lib/Thelia/Model/Map/OrderVersionTableMap.php
	modified:   local/config/schema.xml
	modified:   setup/thelia.sql
	new file:   setup/update/2.0.4.sql

Set cart into orders
	modified:   core/lib/Thelia/Action/Order.php
	modified:   setup/faker.php
Merge pull request #662 from lovenunu/orders-carts

Add relation between order and cart
bug at the time of the payment

if stock=0 and checkAvailableStock=0
Update license in install files and check for url writing
	modified:   core/lib/Thelia/Controller/Front/DefaultController.php
	modified:   local/modules/Front/Config/front.xml
	modified:   web/install/bdd.php
	modified:   web/install/bootstrap.php
	modified:   web/install/config.php
	modified:   web/install/connection.php
	modified:   web/install/end.php
	modified:   web/install/footer.php
	modified:   web/install/header.php
	modified:   web/install/index.php
	modified:   web/install/permission.php
Add function to display/calculate VAT and untaxed postage
add product reference for products list

this is a regular request of users
Conflicts:
	templates/backOffice/default/order-edit.html
Removed setContent() method, which is ununsed (an unusable)
add loop OrderProductTax
change condition when cart is duplicated
add order parameter to BaseSpecificModule loop
Update Customer.php

correction du texte d'erreur si le message n'est pas trouvé.
Fix prev_page usage in pagination
	modified:   templates/backOffice/default/includes/pagination.html
Merge pull request #699 from lovenunu/pagination-tpl

Fix prev_page usage in pagination
fix modification product quantity when status order is cancel
Merge pull request #702 from Alban-io/2.0-updateStock

fix modification product quantity when status order is cancel
Add function to display/calculate VAT and untaxed postage
Merge branch 'patch-vat' of https://github.com/griotteau/thelia into patch-vat
644 rights on files
Merge pull request #672 from griotteau/patch-vat

Add function to display/calculate VAT and untaxed postage