[-] BO : AdminImport add products available fields
Update AdminImportController.php
[-] BO : AdminImport add products available fields
Update AdminImportController.php
Merge pull request #828 from djfm/development

// fixed name of gender 2 in English
[-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT
[-] BO : FixBug - Remove second email in recipient
Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master

Conflicts:
	controllers/admin/AdminImportController.php
// Try to fix regexp issues with some PHP configurations
Merge pull request #825 from indesign47/patch-4

[-] BO : AdminImport add available fields to Products
[-] BO : Adminimport, id_specific key_price not defined
[*] LO : set correct currency format for CHF