"static changes updated to properties file"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

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

Dev branch
Resolved Conflicts.

Conflicts:

src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.java

src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.properties