// move bx_slider css to plugin css
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6

Conflicts:
	themes/default-bootstrap/css/product.css
	themes/default-bootstrap/sass/product.scss