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 branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Integrated InsightsAssignment status APi for student view
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
DOTS DO-5656 Bug fixed
Conflicts Resolved

Conflicts:

src/main/java/org/ednovo/gooru/client/mvp/classpages/unitdetails/UnitAssignmentView.java
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Class setup,Unit setup Bugs Resolved
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1797 from VinRudramurthy/dev-branch

ClassPage: Issue rectified with highlight of editing collection and delete collection.
Modified Unitsetup student view.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Fixed Reordering assignments to another unit,assignment still shows at previous unit
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch