Fixed issue with reorder
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1646 from nutan-gooru/dev-branch

 	Fixed issue with reorder
"Dashboard changes removed for teachear view"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/unitdetails/UnitAssignmentView.java
fixed compilation issue
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1647 from sravanthi1/dev-branch

"Dashboard changes removed for teachear view"
unit setup button has been adjusted.
Merge pull request #1648 from nutan-gooru/dev-branch

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

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/classsetup/ClassSetupView.ui.xml
"Added comments and modified css."
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1649 from shivalinga/dev-branch

unit setup button has been adjusted.
Merge pull request #1650 from mitraj/dev-branch

Added comments and modified css.
added narration in popup
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
UI Changes implemented + null handling implemented.
Merge pull request #1653 from nutan-gooru/dev-branch

Added narration in popup
Merge pull request #1654 from ssushma/dev-branch

UI Changes implemented + null handling implemented.