// languages/helpers/form/form.tpl: wording
// login/content.tpl: wording
// modules_positions/list_modules.tpl: wording
// translations/helpers/view/main.tpl: wording
// languages/helpers/form/form.tpl: wording
Merge pull request #1972 from AlexEven/release

// wording
// w3c
Merge branch 'release' of ssh://github.com/PrestaShop/PrestaShop into release
[-] BO : FixBug #PSCFV-11624 StockManagement Filter
[-] BO : FixBug #PSCFV-11624
[-] BO : FixBug #PSCFV-11624
[-] BO : FixBug #PSCFV-11624 StockManagement Filter
[-] FO : Fix #PSCSX-2735 - product.js, fix price calculation with 6 decimals
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
[-] FO : Fix #PSCSX-2405 change when shipping need multi-shipper
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[-] FO : Fix #PSCSX-2735 - product.js, fix price calculation with 6 decimals
// #PSCSX-2748
//fixed bug #PSCSX-2581
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6