[-] FO : In stock sort is now removed when Stock managment is disabled on default theme.

Not to be confused for my pull #465, which was for default mobile theme.
This is for the default regular theme.
Update WebserviceRequest.php

The deleted method calls $this->resourceConfiguration, which is never initialized in specific web services, so if we use the "display" parameter, the webservice returns an error
//carrier wizard step validation
//carrier wizard step validation part 2
Merge pull request #629 from ChristopheBoucaut/patch-4

[-] WS : setFieldsToDisplay() calls $this->resourceConfiguration, never initialized
// Fixed module cache key (with the country)
Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug

Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge pull request #630 from rimas-kudelis/development

[*] CORE :ProductCore::addSupplierReference() if a reference already exists  update it
//added some help
// Bug fix template override & admin templates
[*] BO : Do not insert duplicates in poruct_carrier, thanks @edamart
[*] BO : Do not insert duplicates in product_carrier, thanks @edamart
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
// norms
//added active field on carrier wizard
[-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu
//small css fix
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Merge pull request #486 from PhpMadman/patch-1

[-] FO : In stock sort is now removed when Stock managment is disabled