conflicts has been 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/unitdetails/UnitAssignmentView.java
Merge pull request #1836 from shivalinga/dev-branch

Dev branch