finish class diagram
Merge branch 'master' into devolution