Merge pull request #1498 from xBorderie/1.6

// Typo in "register_globals" (missing final s).
//Fix multishop tree categories
[-] MO : Loyalty, display loyalty program, according to combination, on change
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// BO : product > combinations > impact on unit price UI fix
// BO : product > combinations > image thumb
[*] BO : tiny mce - fixs PSCSX-896
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] MO : homeslider fix configuration issue
// revert product.js
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6