// Space in AdminThemesController.
Merge pull request #1533 from xBorderie/patch-1

// Space in AdminThemesController.
// themeconfigurator BO link without rewrite
// fixtures
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
[*] MO : Modules list URL updated
// 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
Merge pull request #1535 from dunglas/patch-1

[-] MO : Fixed blocklayered's CSS include
// resize android
// One too many 's'.
// One too many 's'.
// One too many 's'.
[-] FO : Fix bug #PSCSX-851, menu and cart on ontouchstart, second part