upgrade 1.1.0 requires WooCommerce 2.1 +
Merge remote-tracking branch 'upstream/master' into testing

Conflicts:
	functions.php
	header.php
	style.css
	style.less
fix merge functions.php
Merge branch 'testing' of https://github.com/sw33tr/plasenet_woo_superstore into testing