createclient and newactivation createclient uniform
after conflict in clientonetimesalecontroller.js ,createclient and newactivation createclient uniform
Merge pull request #49 from raghuvissu/master

createclient and new activation createclient uniform after conflict
Merge pull request #50 from LAshokReddy556/master

PaymentGatewayController
.
Merge remote-tracking branch 'upstream/master'