// allow whitelisted tags in translations
// unsplit string for better translatability
// added missing mod argument
// moved smartyPostProcessTranslation to Translate class
// trads
[-] FO : show discount table when discount on all combination
Merge pull request #1463 from djfm/translations

// fix a bug that prevented modules installation when language not on pr...
Merge pull request #1462 from djfm/1.6

[+] LO : Allow whitelisted HTML tags in smarty translation functions
//[*] BO : tree backward compat
[-] FO : Fixbug #PSCSX-734 FancyboxI18n
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// avoid sending history message twice
[-] FO : Fixed identity form, DOB is now saved
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
[*] BO: typos in AdminCustomerThreads.
[*] BO: typos in AdminCustomerThreads.
// Fix customer email message thread
[*] BO: typos in AdminCustomerThreads.
[*] BO: typos in AdminCustomerThreads.
[*] BO : ui fixs