Better handling of order status, cancel URL
Merge branch 'master' of github.com:Paymium/WooCommerce

Conflicts:
	checkout.php