Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Conflicts:
	modules/blockcart/ajax-cart.js