//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
Merge pull request #1962 from AlexEven/release

// wording
[-] BO : fixed bug #PSCSX-1832 - customer employee image in SAV
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
// Fixed John Doe secure key
[-] Core: don't cache the file_exists in Module::getInstanceByName
// AdminCustomersController.php: wording
// helpers/form/form.tpl: wording
//AdminEmployeesController.php: wording
// AdminThemesController.php: wording