Merge pull request #100 from LAshokReddy556/obsplatform-2.02

Obsplatform 2.02
MessageTemplate changes
Merge remote-tracking branch 'upstream/obsplatform-2.02' into obsplatform-2.02
'MessageTemplateChanges'