Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
"dev api's integration"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/EditClasspagePresenter.java
Merge pull request #1807 from shivalinga/dev-branch

displaying units in assinment popup issue has been fixed.
1.1 QA [My Collections] - Min score and suggested time entered in one collection reflects in other collections when selected from shelf
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1808 from RavindderV/dev-branch

1.1 QA [My Collections] - Min score and suggested time entered in one collection reflects in other collections when selected from shelf
Color coding issue for error message is resolved
Merge pull request #1809 from ssushma/dev-branch

Color coding issue for error message is resolved
"Analytics chages done"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #1810 from shivalinga/dev-branch

not playing collection in student view issue has been fixed.
Merge pull request #1812 from suryanarayanakb/dev-branch

"analytics reports"
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/server/request/UrlToken.java