// update css code
// update code sass/css
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	themes/default-bootstrap/css/authentication.css
	themes/default-bootstrap/css/my-account.css
	themes/default-bootstrap/sass/comparator.scss