//replace some escape:'html' by addslashes in .tpl with javascript
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development