Merge pull request #1000 from anilgooru/dev-branch

Fixed scroll overflow issue in Collection Edit.
Fixed issue with webpage icon.
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch

* upstream/dev-branch: