"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
"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
display unit name in assignment
resolved conflicts
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
ClassPage: Initial commit on deleting assignment at Unit set up.
Merge pull request #1601 from mitraj/dev-branch

conflicts resolved
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:

src/main/java/org/ednovo/gooru/client/mvp/classpages/unitSetup/UnitsAssignmentWidgetView.java
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1602 from VinRudramurthy/dev-branch

	ClassPage: Initial commit on deleting assignment at Unit set up.
change api call model object
"Reorder pathways functionality inside class setup page implemented"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch