Fix cascade deleting, add JavaDoc to persistence entities
Merge branch 'master' into dev