// Adding hosted module addons request
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
Merge pull request #2235 from djfm/1.6

// CSS, field was taking too much space
//norms
// small change
// fix id_product_supplier uncreate

Before this fix to get the good id_product_attribute you need to save
twice
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// small fix - use different context parameter for theme list
[*] BO : Replace theme in context if necessary
[-] CORE : Fix #PSCSX-3729 value cart_rule when total cart rule > total order
// follow up https://github.com/PrestaShop/PrestaShop/pull/2234
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
// AdminThemesController: wording
Merge pull request #2236 from AlexEven/patch-2

// AdminThemesController: wording
// combinations.tpl: wording
[-] BO : Fix bug #PSCSX-3690, could not set combinations quantity in multishop
// AdminImportController.php: wording
// quantities.tpl: wording
Merge pull request #2237 from AlexEven/patch-3

// wording: available date > availability date
// Folow up https://github.com/PrestaShop/PrestaShop/commit/d78ec091237a48fe3b20038c13570d0233c85576#commitcomment-8336489