.
.
added Cancel Payment
Merge remote-tracking branch 'upstream/master'
.
.
fix issues in PaymentGatewayApi
.
.