Merge WooCommerce
style sheet commit
Merge branch 'master' of https://github.com/andrewmclagan/flex

Conflicts:
	lib/config.php
	lib/scripts.php
	style.css