"Reorder Changes in classsetupview updated."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/classsetup/ClassSetupUnitView.java
	src/main/java/org/ednovo/gooru/client/mvp/classpages/classsetup/ClassSetupView.java
	src/main/java/org/ednovo/gooru/client/mvp/classpages/classsetup/classsetup.css
"reorder classitems changes handled"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
"Reoder Pathways Api Call changes updated."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/classsetup/ClassSetupPresenter.java
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/classsetup/ClassSetupPresenter.java
class setup pagination event added
Merge pull request #1594 from ssushma/dev-branch

class setup pagination event added
"Reorder pathways changs updated."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/classsetup/ClassSetupPresenter.java
	src/main/java/org/ednovo/gooru/client/mvp/classpages/classsetup/classsetup.css
Merge pull request #1595 from shivalinga/dev-branch

Null pointer exception has been handled.
Merge pull request #1596 from shivalinga/dev-branch

Click event added for units in unit setup page.
display unit name in assignment
Updated Progress UI.
Merge pull request #1597 from anilgooru/dev-branch

Updated Progress UI.
resolved conflicts
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1598 from shivalinga/dev-branch

getPathwayItems server implementation has been changed.
"implementing pagination for Assignments"