For sorting dropdown UI has been 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/studentView/StudentAssignmentView.java
Merge pull request #536 from ssushma/dev-branch

Drop list added with sort options in teach mode.
Tag OER for resource - Reverted the code.
If users are blocked error msg is shown.
Update Progress bar on assign and deleting assignment.
Merge pull request #537 from VinRudramurthy/dev-branch

Tag OER for resource - Reverted the code.
Merge pull request #538 from anilgooru/dev-branch

Update Progress bar on assign and deleting assignment.
Changed the static text value.
Resolved conflicts and updated sort dropdown UI in teach.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into 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/edit/EditClasspageView.java
Merge pull request #539 from shivalinga/dev-branch

For sorting dropdown UI has been added.
Updated css.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/client/mvp/classpages/edit/editclasspage.css
Merge pull request #540 from anilgooru/dev-branch

Updated css.
fixed css issue and implemented api to display follow button
"[FE] Add suggestions in collection edit under search Implemented for Add Resources."
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

Conflicts:
	src/main/java/org/ednovo/gooru/server/request/UrlToken.java
Merge pull request #541 from nutan-gooru/dev-branch

fixed css issue and implemented api to display follow button