// blockwishlist: better wording.
// Spelling mistake
Merge pull request #1637 from xBorderie/patch-1

// blockwishlist: better wording.
[-] Core : Bug #PSCSX-1610, Fix stock management issue with supply order
[-] FO : Fix bug #PSCSX-1626, cat img not responsive
// norms
[-] BO : Fix bug #PSCFV-10539, memcache_connect
// refacto paymentmodule, mail template used
Merge remote-tracking branch 'origin/1.6' into 1.6
// module's folder img is kept unmodified when upgrading the module
// AdminTaxRulesGroupController: Typo.
[-] FO : Fix #PSCFV-11235, transitionIn is fancybox 2
Merge pull request #1638 from xBorderie/patch-1

// AdminTaxRulesGroupController: Typo.
// typo
[-] BO : FixBug #PSCSX-1426 - Themes modifications
[+] Core: Unit tests first part
// Wording
Merge pull request #1639 from Dvir-Julius/patch-1

// Wording
// small changes
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6