"Ananlytics - collection progress "
"Ananlytics - collection progress "
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/EditClasspageCBundle.java
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/EditClasspageView.java
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/EditClasspageView.ui.xml
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/IsEditClasspageView.java
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/editclasspage.css
Updated Progress UI.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  added close statement
  implemented pagination for assignment
  "ScoreHeading widget created."
  Pom changes made for heap memory issue
  "Goals ui added "
Added required services.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Unitsetup pagination issue resolved.
  "Unit Setup allignment changes updated for student view and teacher view"
  Rectified Ui issue and pagination issue.
  Minimum score and suggested time validation implemented
  wrote condition for display required and optional circle
  "DashBoard ui modified."
  Rectified UI issues in unit setup.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  implemented pagination after reorder
  added event
  handle null for assignment
Integrated API.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
  Added reorder widget for assignment at unitsetup.
  Validations added for scoreHeder in DashBoard.
  "Dashboard changes removed for teacher view."
  fixed null issue
  Integrated re-order ui for assignments in unit set up.
"analytics changes done"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	pom.xml
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/EditClasspagePresenter.java
	src/main/java/org/ednovo/gooru/client/mvp/classpages/unitdetails/UnitAssignmentPresenter.java
"added reaction analytics images"
change collection id to resource unit id
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1665 from mitraj/dev-branch

implemented pagination in student unitsetup page.
New Partner libraries integrated to the existing code.
Merge pull request #1666 from ssushma/dev-branch

New Partner libraries integrated to the existing code.
"Update Assignments changes"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

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