Merge pull request #1 from KateOl/fix1

Diagram file name and folder name were renamed
Merge pull request #2 from KateOl/development

Merge pull request #1 from KateOl/fix1
Merge pull request #3 from KateOl/fix1

Merge pull request #2 from KateOl/development
Merge pull request #4 from KateOl/development

Merge development and master.