//keep login in url when redirect to adminLogin
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release