updated UML diagram to reflect architecture changes and matching syntax for object classes
Merge remote-tracking branch 'origin/master'