// Bug fix : Theme configurator & master branch
Merge branch 'master' of github.com:PrestaShop/PrestaShop-modules