Add cancel-payment in gateway->purchase
Merge branch 'aug_4_2014'