// data-id-product instead of using rel tag
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	themes/default-bootstrap/products-comparison.tpl