AfterAllChanges
Merge remote-tracking branch 'upstream/master'
'ChangesInJobs'
AddingData
.
.
Merge pull request #47 from LAshokReddy556/master

changes in editjobparameters
.
Merge branch 'master' of https://github.com/Rakeshadlagatta/Clientapp
Merge branch 'master' of https://github.com/avshyd/Clientapp
createclient and newactivation createclient uniform
after conflict in clientonetimesalecontroller.js ,createclient and newactivation createclient uniform
Data
Data
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'
Changes for isPrepaid in ordercontroller and dateformat for viewJob