resolved conflict in message properties
change css
resolved conflict
Merge pull request #532 from nutan-gooru/dev-branch

resolved conflict in message properties