#222 implement soft deletes for teams
#222 Code review
Merge branch 'issue_222' into develop