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
Merge pull request #156 from gmorel/coupon

Coupon - Refactor the way parameters are stored
start a new section in changelog file
put at the beginning of changelog file the new features
Merge pull request #157 from gmorel/coupon

Coupon : Fix bug preventing to update Coupon
session parameter is needed on TaxEngine::getInstance method
delete all sub categories on category removal, fix issue #150
delete product on category removal. delete only when it's the default
category. Fix issue #151
update changelog
Merge branch 'master' of https://github.com/thelia/thelia into coupon

* 'master' of https://github.com/thelia/thelia:
  update changelog
  delete product on category removal. delete only when it's the default category. Fix issue #151
  delete all sub categories on category removal, fix issue #150
  session parameter is needed on TaxEngine::getInstance method
  put at the beginning of changelog file the new features
  start a new section in changelog file
  uncomment needed loop for parent folder
  add missing value in folder modification form
  uncomment needed return statement
  Use $parent instead of $folder_id in folders admin template