Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop

Conflicts:
	integration-test/src/test/java/org/sagebionetworks/IT500SynapseJavaClient.java
	lib/lib-auto-generated/src/main/resources/Register.json
Merge branch 'develop' of https://github.com/Sage-Bionetworks/Synapse-Repository-Services into develop
Add skeleton code for trash manager
Add skeleton code for trash manager
Merge branch 'trashcan' of https://github.com/eric-wu/Synapse-Repository-Services into trashcan
Better naming parentId -> originalParentId
Add InvalidUserException
Add InvalidUserException -- test part
Add skeleton code for trash manager
Better naming parentId -> originalParentId
Add InvalidUserException
Add InvalidUserException -- test part
Clean unused code in NodeDAOImpl
Merge remote-tracking branch 'origin/trashcan' into trashcan

Conflicts:
	services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/trash/TrashManagerImpl.java
Add a e-tag generation method that does not depend on entity content
Add a method to send a entity change message
Move update() to a shared private updateNode()