change static text to message properties
resolved conflict

Conflicts:
	src/main/java/org/ednovo/gooru/shared/util/MessageProperties.java
Merge pull request #681 from nutan-gooru/dev-branch

Change static text to message properties