revised resource deletion
Merge remote-tracking branch 'origin/master'

Conflicts:
	store/cloudsql/src/main/java/org/activityinfo/store/hrd/entity/Snapshot.java
	store/cloudsql/src/main/java/org/activityinfo/store/hrd/entity/Workspace.java