Changes for units count mismatch implemented
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1784 from ssushma/dev-branch

Units count issue resolved
updated static text in collections view
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/tabitem/assignments/collections/CollectionsView.ui.xml