// added displayOverrideTemplate hook on the installer, it must not use live_edit
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6