Message property file conflicts has been resolved.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

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

Message property file conflicts has been resolved.