Added a "Shipping zones" button to delivery modules, plus warning
Added module_id parameter to Area loop
First sale commit
rebased master
Added a "Shipping zones" button to delivery modules, plus warning
Added module_id parameter to Area loop
First sale commit
rebased master
Fixed typo
Added import features to tools menu
Added PRODUCT_ID output variable
On thelia root, the user is redirected to /web
Fix for #577
Updated faker to 1.5.x-dev
Using realText() in faker to get i18n text instead of latin
Added moment.js and bootstrap-datetimepicker
Added sale admin management
Merge branch 'sales' of https://github.com/roadster31/thelia into sales

Conflicts:
	core/lib/Thelia/Action/Sale.php
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Controller/Admin/SaleController.php
	core/lib/Thelia/Core/Event/Sale/SaleUpdateEvent.php
	core/lib/Thelia/Core/Event/TheliaEvents.php
	core/lib/Thelia/Form/Sale/SaleModificationForm.php
	core/lib/Thelia/Model/Base/AttributeAv.php
	core/lib/Thelia/Model/Base/AttributeAvQuery.php
	core/lib/Thelia/Model/Base/SaleProduct.php
	core/lib/Thelia/Model/Base/SaleProductQuery.php
	core/lib/Thelia/Model/Map/SaleProductTableMap.php
	core/lib/Thelia/Model/Sale.php
	local/config/schema.xml
	templates/backOffice/default/admin-layout.tpl
	templates/backOffice/default/forms/standard/form-field-attributes-renderer.html
	templates/backOffice/default/sale-edit.html
	templates/backOffice/default/sales.html
Merge branch 'master' into sales

Conflicts:
	composer.lock
	core/lib/Thelia/Model/ProductSaleElementsProductDocumentQuery.php
	core/lib/Thelia/Model/ProductSaleElementsProductImageQuery.php
	local/config/schema.xml
	setup/thelia.sql
	templates/backOffice/default/admin-layout.tpl
	templates/backOffice/default/assets/css/styles.css
	templates/backOffice/default/tools.html
Merge branch 'master' into sales