cart
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/bootstrap/style.css
	wp-content/themes/bootstrap/style.less
	wp-content/themes/bootstrap/woocommerce/cart/cart.php
cart
Merge remote-tracking branch 'origin/master'

Conflicts:
	wp-content/themes/bootstrap/style.css
	wp-content/themes/bootstrap/style.less
cart