Merge branch '1.6' of https://github.com/frederic-benoist/PrestaShop into frederic-benoist-1.6

Conflicts: themes/default-bootstrap/modules/homeslider/homeslider.tpl