// warehouses/helpers/view/view.tpl: Typo.
Merge pull request #1984 from xBorderie/patch-1

// warehouses/helpers/view/view.tpl: Typo.
// Don't display the add button on admincustomers when it is not possible (on context all)
// fix enter key bind on the filters of listings
// missing on_sale on bestsellers
// multishop
[-] BO : Fix #PSCSX-2690, Set correct id_country for address format with error management
Merge branch 'release' of github.com:PrestaShop/PrestaShop into release
[-] BO : Fix PSCSX-2620 when edit home category and save don't go back in root category
[-] BO : Fix PSCSX-2620 breadcrumb if multiple root categories in monoshop
// small fix categories is_root no link to go back
// small fix duplicate in root link in multishop context
// fix multiple is_root_category
// classes/Product.php: wording
Merge pull request #1985 from AlexEven/release

// classes/Product.php: wording
// added displayOverrideTemplate hook on the installer, it must not use live_edit
// fix php compatibility
// GuestTrackingController.php: wording.
Merge pull request #1987 from xBorderie/patch-1

// GuestTrackingController.php: wording.
// AdminAddressesController.php: wording