// Add CDATA to module configuration file in order to prevent htmlentities break
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6