Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Started
Merge branch 'develop' into PLFM-1708
added more entity file access control
meaningless commit
Merge branch 'develop' into PLFM-1708
Add trash service
Add trash service
Merge branch 'develop' of https://github.com/eric-wu/Synapse-Repository-Services into develop
added basic file entity and get file url
fixed register parser error
Add trash controller
Create the trash service bean
Fixed flaky test
Merge pull request #293 from john-hill/PLFM-1708

Plfm 1708
Add trash service
Add trash controller
Create the trash service bean
PLFM-1734 do not set benefactor to the root
Merge branch 'develop' of https://github.com/eric-wu/Synapse-Repository-Services into develop