[-] FO : Fix bug #PSCSX-702, could not have jquery in tpl inline script
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6