//small fix
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.
// Fix duplicate supply order suppliers
// Change order google static map
[-] BO : Fix bug #PSCSX-950, bad dashboard stats_date_from
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] BO : Fix #PSCSX-928, change default color for colorpicker
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// Fix previous commit
//Add click on order delivery and invoice map
// Small fix
[*] BO : supply orders fixs
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] BO : FixBug #PSCSX-952
Merge pull request #1482 from xBorderie/1.6

[*] BO: wording in multistore mode when editing an option.
// Small typo.
//Fix date format