//Fix theme
Merge branch 'release' of ssh://github.com/PrestaShop/Prestashop into release