shoppingfluxexport 3.1.1
[-] MO : compatibility with socolissimo
//small fix marketplace name
Merge branch 'master' of https://github.com/shoppingflux/PrestaShop-modules into shoppingflux-master
Shopping Flux - config.xml updated