Merge pull request #2160 from VinRudramurthy/dev-branch

Folders: Issue rectified with display of reorder options,when user has more coll/folders.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch