Uml diagram
Small changes to uml-diagram
Merge branch 'Database-And-Model'