Merge pull request #129 from kiranhugo/master

fixed Some issues related to payment gateway
.
.
.
.
.
Merge remote-tracking branch 'upstream/master'