small fix
Merge branch 'master' into shrey-paymentFix
dummygateway done