Merge pull request #2086 from djfm/release

[-] CORE :  fix PSCSX-2257 for good, no more HTML in the translatable string
[-] FO : Fix bug #PSCSX-3243, blockcart hidden in colums on small screen
// typo
Merge pull request #2088 from djfm/release

// added selenium friendly id
// follow up PSCSX-3184
// fix class name
[-] : Fix bug #PSCSX-3184, no meta for 404 page

Conflicts:

	install-dev/upgrade/sql/1.6.0.10.sql
// report of https://github.com/e-frogg/PrestaShop/commit/fda101b5275c855672687222bf4719fb72c7ce89
[-] FO : Fix #PSCSX-3211 no more duplicate product when reorder with cart_rule

Conflicts:
	classes/Cart.php
Merge pull request #2089 from djfm/release

// make button selenium friendly
//small fix
// Small fix untrusted xml
// Update CSS files (recompile SASS)
[-] BO : fixed bug #PSCSX-799
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
[*] Installer: allow to install only some parts of the software with the cli installer
// merge cherry-pick
[*] BO : Introduce new untrusted modal window (see #PSCSX-3245)
// Wording
Merge branch 'release' of github.com:PrestaShop/PrestaShop into release