// fixed translation of modules descriptions containing quotes
Merge pull request #1 from PrestaShop/development

update from prestashop/development
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
// fix small translation bug PSCFV-10329
// small improvement to Brazilian translations
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge pull request #691 from djfm/development

// fixed translation of modules descriptions containing quotes
[-] BO : fix contructor override on AdminImportController

When we overload the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
[-] BO : fix postProcess override on AdminImportController

When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
Default case of switch is never used.
Merge pull request #736 from codeurWeb/patch-2

[-] BO : fix ovverride of constructor when PS_ADVANCED_STOCK_MANAGEMENT is off
Merge pull request #737 from codeurWeb/patch-3

[-] BO : fix postProcess override on AdminImportController
// remove notice
// use ObjectModel::validateField on validaterules
//
BO: Modules - show update button even if module is not installed but don't
warn for modules with updates available but not installed.
Merge pull request #743 from dlage/modules_update

[*] BO : Show modules update button even if module is not installed but not notices
[-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore
Merge remote-tracking branch 'origin/development' into development
[*] LO : Updated many localization packs
[*] LO : Added states to Japanese localization pack