All my changes #2
add smart coupon support, checkout improvements and others
Merge remote-tracking branch 'origin/develop'

Conflicts:
	dev/wp-content/themes/pureformance/blog.php
	dev/wp-content/themes/pureformance/footer.php
	dev/wp-content/themes/pureformance/functions.php
	dev/wp-content/themes/pureformance/header.php
	dev/wp-content/themes/pureformance/js/main.js
	dev/wp-content/themes/pureformance/strategies.php
	dev/wp-content/themes/pureformance/style.css
	dev/wp-content/themes/pureformance/woocommerce/checkout/thankyou.php
	dev/wp-content/themes/pureformance/woocommerce/myaccount/my-account.php
Fix conflicts