Merge pull request #1 from PrestaShop/development

update from prestashop/development
[-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935
// another fix for multishop fields in context all on product page
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Conflicts:
	controllers/admin/AdminImportController.php
// licence
[-] BO : do not reaffect import_type for categories
[-] BO : Issue with domready on adminImport
[-] MO : PNM-1715 - Bug fix accented chars & ajax-cart
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Send noindex header to avoid ghost carts by bots
Merge pull request #732 from Ha99y/20130919_X-Robots

[*] CORE : Send noindex header to avoid ghost carts by bots
// Blockcustomerprivacy should not be installed by default
// Better cache depth management for smarty
[-] MO mailalert : products alerts can be registered for multiple guests
#PNM-1669
Merge remote-tracking branch 'origin/development' into development
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
[-] MO: Fix time of smarty cache invalidation
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
[-] Installer : added the missing default tab in the employee