[*] BO : #PSCSX-2087
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	admin-dev/themes/default/template/helpers/modules_list/list.tpl