* '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
e038c330c7