Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[*] BO : Changed 'state' for 'status' in many strings.
Merge pull request #1604 from xBorderie/1.6

[*] BO : Changed 'state' for 'status' in many strings.