[-] BO : Fix bug #PSCSX-3360, bad email template on renew password
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6