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
Merge pull request #1794 from anilgooru/dev-branch

Fixed issue with color for text.
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
"1.1 QA [My Classes] Course are displayed in standards view at Unit Details Page Fixed"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #1795 from sravanthi1/dev-branch

1.1 QA [My Classes] Course are displayed in standards view at Unit Details Page Fixed.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
"1.1 QA [My Classes] Remove h from "time studying" when hours is 0 or not set Fixed"
Merge pull request #1796 from sravanthi1/dev-branch

1.1 QA [My Classes] Remove h from "time studying" when hours is 0 or not set Fixed.
Class setup,Unit setup Bugs Resolved
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch