[-] BO : Fix bug #PSCFV-12272, can not translate theme overriden mails
Merge pull request #2273 from djfm/release

// fixed issue where strings in files included with ./something.tpl did ...
// undefined var
[-] BO : Fix bug #PSCSX-3893, Prev/ next buttons on order page does not check current Shop selection
// oops
// small fix
// console.log
// fix downQuantity()
// Small fix
// Small Fix
Merge pull request #1 from PrestaShop/release

Syncing with release
Simplified PrestaShopAutoload::normalizeDirectory
Merge pull request #2282 from studiokiwik/release

[*] CORE : Simplified PrestaShopAutoload::normalizeDirectory
// follow up https://github.com/PrestaShop/PrestaShop/pull/2108
// Fix addons request
Merge branch 'release' of ssh://github.com/PrestaShop/PrestaShop into release
// FixBug HOSTED-642 - Typo
// Fix missing parameters in Cart ObjectModel
Merge pull request #1761 from 1RV34/patch-1
// Small fix