Merge remote-tracking branch 'upstream/master'
Merge pull request #53 from Rakeshadlagatta/master

API for Event Action Mapping
PaymentUpdate
PaymentUpdateandSolveConflicts
changes in Userchat
Merge remote-tracking branch 'upstream/master'
Merge pull request #54 from LAshokReddy556/master

PaymentGatewayConflicts
.
dailyPurposeOnly
Merge remote-tracking branch 'upstream/master'
'UpdateInPaymentConnamdDeSerializer'
Merge pull request #55 from LAshokReddy556/master

PaymentGatewayCommandJsonDeserializerChanges
.
.
PaymentCanel
Merge pull request #57 from kiranhugo/master

Modifications in Payments
Here Changes on No duplicate value for receipt num in payments and officeid filed added in edit client