"Static text changed to message properties file"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

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

"Static text changed to message properties file"