Updated class diagrams
Merge branch 'develop'