// missing calls to translation function
// text harmonization
// Override update
// Update install version
// same order as product page for getAttributesColorList
[-] FO : Fix bug #PSCFV-12189, color picker is not working with accented characters
[-] BO : Fix bug #PSCSX-2658, combinations edition
Merge pull request #1954 from djfm/1.6

// text harmonization
[-] INSTALLER: don't launch sessions on smarty compilation to avoid race conditions
//keep login in url when redirect to adminLogin
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
// cast shop id
// fileuploader.js: wording
// order-slip.tpl: wording
// AdminBackupController.php: wording
//backup/download/view.tpl: wording
// backup/helpers/list/list_header.tpl: wording
// guest-tracking.tpl: wording
// install-dev/models/database.php: wording
// GuestTrackingController.php: wording