//Fix save and stay combinations problem
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap