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: typo in multistore mode when editing a product.
[*] BO: wording in multistore mode when editing an option.
Merge pull request #1482 from xBorderie/1.6

[*] BO: wording in multistore mode when editing an option.