upgrade 1.1.0 requires WooCommerce 2.1 +
update 1.1.1
Update 1.1.2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	functions.php
	header.php
	includes/js/third-party.js
	style.css
	style.less