// Fixed Tools::jsonEncode() on Tools.php
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development