// removed useless files, add them back if you want to change their contents - English version used otherwise
// css fix

Conflicts:

	themes/default-bootstrap/css/global.css
	themes/default-bootstrap/sass/global.scss
// css fix
// translations
// updated installer translations
Merge pull request #1549 from djfm/release

// removed useless files
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
Merge pull request #1556 from djfm/release

[+] LO : Update Installer Translations
// fixed typo
Merge pull request #1557 from djfm/release

// fixed typo
// typos
Merge pull request #1558 from djfm/release

// typos
// home images size
[-] FO : no cache when live edit !
[-] BO : Always test bulk enable/disable in initProcess
[-] MO : fixed #PSCSX-1137
[-] FO : Fix bug #PSCSX-1135, bad cache id for homlefeatured
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
[-] MO : Fix bug #PSCSX-1135, home bad cache id
//small fix