New Diagram and DB dump
Merge branch 'master' into hash
Add topic editor
commit