Merge pull request #102 from LAshokReddy556/master

ExternalId and Paymentgateway changes
MessageTemplate changes
Merge remote-tracking branch 'upstream/master'
'MessageTemplateChanges'