// text harmonization
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