:)
:)
2
;>
:->
merged PLFM-1665
Fix for PLFM-1696
Merge pull request #322 from john-hill/PLFM-1696

Plfm 1696
PLFM-1700 Implement purging at the manager level
PLFM-1700 Add more tests for purging at the manager level
PLFM-1700 Implement purging at the controller level
PLFM-1700 Implement purging at the Java client
PLFM-1700 Implement purging at the manager level
PLFM-1700 Add more tests for purging at the manager level
PLFM-1700 Implement purging at the controller level
PLFM-1700 Implement purging at the Java client
Refresh from upstream
Merge pull request #323 from eric-wu/develop

PLFM-1700 Implement trash can purging
DAO level implementation of Favorites
Added Manamger/Service/Controller for Favorites, also testing