Merge branch 'shoppingflux-master'
Merge pull request #1 from PrestaShop/master

Merge branch 'shoppingflux-master'