// 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
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
// stock available fixtures
[-] CORE : Fix bug #PSCSX-1097, typo in cache_control
[-] MO : Fixed blocklayered's CSS include
[*] FO : optimize condition for a faster frontend
// Needed to be done twice
[*] FO : one less frontend query
[+] LO : Added Czech installer - want yours? Join us on Crowdin!
[+] LO : Added Turkish installer - want yours? Join us on Crowdin!
Merge pull request #1538 from djfm/installer

[+] LO : Added Czech and Turkish installers!
[-] Installer : wrong module name caused wrong position
// forgot tr and cs installer fixtures folders
Merge pull request #1539 from djfm/release

// forgot tr and cs installer fixtures folders
// Rollback for the "checkout" module category
[*] BO : Module Theme Configurator