Merge branch 'hotfix/1.3.7'
Add escaping in tpl files
Fix license blocks
Workaround for prestashop validator
Fixes for prestashop validator
Merge branch 'hotfix/1.3.8' into develop