// add override js file for blockwishlist
git Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6