Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch:
Merge pull request #1538 from anilgooru/dev-branch

reindex set to 97
New apis added for pathways
Merge pull request #1539 from ssushma/dev-branch

New apis added for pathways
delete pathway api added
Merge pull request #1540 from ssushma/dev-branch

delete pathway api added
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Integrated UI for unitsetup using widget.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1541 from VinRudramurthy/dev-branch

Integrated UI for unitsetup using widget.
"units selection css functionality added."
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch

Conflicts:

src/main/java/org/ednovo/gooru/client/mvp/classpages/unitdetails/UnitAssignmentView.java
DO object changes updated
Merge pull request #1543 from ssushma/dev-branch

DO object changes updated
Merge pull request #1542 from mitraj/dev-branch

units selection css functionality added.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
implemented getPathwayItems api
resolved conflicts

Conflicts:
	src/main/java/org/ednovo/gooru/client/service/ClasspageService.java
	src/main/java/org/ednovo/gooru/client/service/ClasspageServiceAsync.java
	src/main/java/org/ednovo/gooru/server/request/UrlToken.java
	src/main/java/org/ednovo/gooru/server/service/ClasspageServiceImpl.java
Merge pull request #1544 from nutan-gooru/dev-branch

Implemented getPathwayItems api
implemented getPathwayItems in view