// fix manufacturer list in list
Merge branch '1.6' of https://github.com/sLorenzini/PrestaShop into sLorenzini-1.6

Conflicts:
	themes/default-bootstrap/css/global.css
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6