"moving the static text to message properties"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

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

moving the static text to message properties