LUN-1311: folder delete view will not hide trashed objects
Merge pull request #43 from pbs/LUN-1311

LUN-1311: folder delete view will not hide trashed objects