[-] Installer : fixtures : ref demo_1 to demo_7
Merge branch 'patch-28' of https://github.com/indesign47/PrestaShop into indesign47-patch-28

Conflicts:
	install-dev/fixtures/fashion/data/product.xml

Signed-off-by: gRoussac <gregory.roussac@prestashop.com>
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6