//removed _PS_DISPLAY_COMPATIBILITY_WARNING_ from _PS_MODE_DEV_
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6