// 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 fix with mode catalog and cart button
// Add gender on order view
[-] BO - fixed bug #PSCFV-10286 - End range in summary of shipping wizard not correct when range number is a float
[-] BO - fixed bug #PSCFV-10178
// Avoid exception if amount is null on addind an orderpayment
[-] BO : Fix bug #PSCFV-8214 import entity pre selected
[-] Bo : Modules 'save' button not active
[-] MO : Editorial could not delete image
[*] 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