new branch coupon
Merge branch 'master' of https://github.com/thelia/thelia into coupon

* '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
Refactor : Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too (Event are used for custom inputs)
Refactor : Coupon effect inputs are now more customisable
Adding effect to be stored as serialised in JSON
Update changelog
Refactor : Thelia2 can now deduce extended effect parameters
Merge
Coupon : Fix unit test
Coupon : Fix unit test
Use $parent instead of $folder_id in folders admin template
uncomment needed return statement
add missing value in folder modification form
uncomment needed loop for parent folder
Coupon : remove .gitmodule
Coupon : Fix controller
Coupon : Fix mistake with chmod,  file mode set as 644 as it originally was
Coupon : Fix mistake with chmod,  file mode set as 644 as it originally was
Coupon : Fix mistake with chmod,  file mode set as 644 as it originally was
Remove submodule
Coupon : Fix mistake with chmod,  file mode set as 644 as it originally was
Remove submodule
Merge pull request #156 from gmorel/coupon

Coupon - Refactor the way parameters are stored