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 #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
not playing collection in student view issue has been fixed.
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"
1.Fixed displaying class info bug.
2.changed data logs events parent id from classpage id
to unit id.
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
Merge pull request #1813 from shivalinga/dev-branch

Fixed displaying class info issue,changed data logs events  parent id value
Analytics null handling implemented
Merge pull request #1815 from ssushma/dev-branch

Analytics null handling implemented
Missing file has been commited.
Merge pull request #1816 from shivalinga/dev-branch

Missing file has been commited.
1.1 QA [My Classes] Directions are displayed at minimum score and Due Date are not displayed at Unit details page when assignment assigned from library Share