[*] FO: Cache result of FrontController::isInWhitelistForGeolocation() to reduce preg_match() calls
[-] BO : Fix #PSCFV-10424 deletion of attire with stock advanced
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// no need to execute AdminController::filterTabModuleList() many times...
Merge pull request #2238 from djfm/1.6

// fixed automatic creation of database in installer on HHVM
[*] BO : Fix #PSCSX-3734, Do not display specific price if currency is not activated
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6
// AdminOrders listing perfs
// Follow up 1a096eb960a043776402fa15415d0f0a34b79bc6
[-] BO : Fix bug #PSCFV-11809 import of attributes bad ean13
// AdminProductsController: wording
Merge pull request #2240 from AlexEven/patch-2

// AdminProductsController: wording
// Configuration is already loaded before
// AdminImportController.php: wording

can not >> cannot
Merge pull request #2241 from AlexEven/patch-2

// AdminImportController.php: wording
// Deprecated conf key removed
[*] Core: ObjectModel::__construct() perfs improvements
[-] BO : Fix bug #PSCSX-3703, invalid date_add after category import
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6
// Norm else if and elseif