Merge pull request #1994 from AlexEven/release

// products/helpers/form/form.tpl: wording
// /install-dev/controllers/http/system.php: wording.
// trim posted current password on adminemployee
Merge pull request #1995 from xBorderie/patch-1

// /install-dev/controllers/http/system.php: wording.
// small fix
Merge branch 'release' of github.com:PrestaShop/PrestaShop into release
[-] BO : Fix bug #PSCFV-12359 first part
Merge branch 'release' of ssh://github.com/PrestaShop/PrestaShop into release
// notice
[-] BO : FixBug #PSCSX-1257 - Tabs not loaded correctly
Merge branch 'release' of ssh://github.com/PrestaShop/PrestaShop into release
// products/helpers/form/form.tpl: wording. New error message.