Merge pull request #699 from nutan-gooru/dev-branch

Changed static text to message properties
fixed UI changes
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch