// Cache name
// follow up https://github.com/PrestaShop/PrestaShop/commit/652f8101e2baeeac35abf9c0f9ab3bc671d081fc
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// Use normalizeDirectory function in PrestaShopAutoLoad
[-] BO : Fix bug #PSCSX-2695, id_shop in url VS virtual urls
[-] FO : Fix bug #PSCSX-2991, 404 on cat image
// adapt w3c blocktopmenu
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
[*] IN : the installer now check the auto increment configuration (increment and offset)
[-] IN : reduced session name length in the installer (which was displaying a warning from time to time)
[*] BO : Fix #PSCSX-2978, Add slashes for Adresses (cf https://github.com/PrestaShop/PrestaShop/pull/2047)
// active field for AdminShopUrl
[-] MO : changed $this->l() that could not work to Tools::displayError() in ModuleCore
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// typo
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[-] IN : Fix PSCSX-2549 don't get warning at upgrade
// Fix insert ignore warning at upgrade
// followup https://github.com/PrestaShop/PrestaShop/commit/388384545e4614a13ce05394a3b057a5cc3b6a61