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.
UI issues fixed.
Merge pull request #545 from anilgooru/dev-branch

Fixed Follow and Unfollow issue.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch