// AdminThemes : hints added on create & update form
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Conflicts:
	controllers/admin/AdminThemesController.php
[-] BO : Fix bug #PSCSX-1087, parserror on category tree
[-] BO : Fix bug #PSCSX-1091, setAdvancedStockManagement called without validateFields
//tab module list small fix
[*] MO : Modules list URL updated
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
// stock available fixtures
// stock available fixtures
[-] Installer : fix an issue when the new theme is inserted twice
// small css fix
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
// norm
[-] FO : Fix bug #PSCSX-851, menu and cart on ontouchstart, first part
[-] MO : Fixed blocklayered's CSS include
[-] CORE : Fix bug #PSCSX-1097, typo in cache_control
[-] CORE : Fix bug #PSCSX-1097, typo in cache_control
Merge pull request #1535 from dunglas/patch-1

[-] MO : Fixed blocklayered's CSS include
[-] MO : Fixed blocklayered's CSS include
// resize android