Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
statc text has been moved to properties file.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/tabitem/assignments/collections/CollectionsView.ui.xml
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.java
	src/main/java/org/ednovo/gooru/shared/i18n/MessageProperties.properties
Merge pull request #1765 from shivalinga/dev-branch

statc text has been moved to properties file.
comment unwanted code
resolved conflicts