Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// Small Fix
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] BO : fix colorpicker
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// Use shop context to control if the module is active
[-] MO : Blockcart , Fix bug #PSCSX-609 first part
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// small change
// put neutral content in default CMS info block
Merge pull request #1483 from xBorderie/patch-5

// Small typo.
// Suppliers orders small fix
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// Fix double traduction for errors
// Wording
// cast query param
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// norm
// blockart overlay z-index