Changes
Merge branch 'master' of github.com:trustpay/TrustPay_WooCommerce_Demo

Conflicts:
	.gitignore
Changes to the cancel url