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
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
Merge pull request #542 from VinRudramurthy/dev-branch

	Changed the static text value.
Merge pull request #543 from sravanthi1/dev-branch

"[FE] Add suggestions in collection edit under search implemented for Add Resources popup in Organize"
"New files added for [FE] Add suggestions in collection edit under search"
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch
Merge pull request #544 from sravanthi1/dev-branch

"New files added for [FE] Add suggestions in collection edit under search"
Fixed Follow and Unfollow issue.