// fixed translation of modules descriptions containing quotes
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
// fix small translation bug PSCFV-10329
[*] FO: Allow to enable SSL on all the pages
[*] BO : Set import entity in cookie (#PSCFV-8214)
// small fix for SSL
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] BO : Fix proces and save buttons for Modules and AdminControllers
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
// typo
// small improvement to Brazilian translations
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935
// another fix for multishop fields in context all on product page
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Conflicts:
	controllers/admin/AdminImportController.php
// licence
[-] BO : do not reaffect import_type for categories
[-] BO : Issue with domready on adminImport