Merge pull request #369 from sheebans/master

Removed the logic of fetching the collection items using username
Removed unecessary user table join in getMyFolder