Merge pull request #2000 from AlexEven/release

// products/helpers/form/form.tpl: wording. New error message.
//update product tab error message
// Change no multishipping address call position
// update
// small fix
//update
Merge pull request #1998 from LucasC/patch-1

// Fix Country Warning bug
// small fix
// Fix Country Warning bug

The warning was wrongly displayed for all non native modules
// Fix for Performance issue
// fix css for multi shipping
Merge branch 'release' of github.com:PrestaShop/PrestaShop into release
// typo
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
[MO] : blocktopmenu - Correct top menu display issue #PSCSX-2607
[MO] : blocktopmenu - Correct top menu display issue #PSCSX-2607
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// Small fix
[MO] : blocktopmenu - Correct top menu display issue #PSCSX-2607
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release