fixes and improvements
fixes and improvements
Merge remote-tracking branch 'origin/develop'

Conflicts:
	dev/wp-content/themes/pureformance/header.php
	dev/wp-content/themes/pureformance/woocommerce/cart/cart-empty.php
	dev/wp-content/themes/pureformance/woocommerce/cart/cart.php
Fix conflicts