fix rest,gui add uml class diagramm
Merge remote-tracking branch 'origin/master'