Fix ACL on the trash folder
Changes to address feedback on pull request 280
Changes to address feedback on pull request 280
Merge pull request #281 from eric-wu/develop

Changes to address feedback on pull request 280