Object Model diagram + minor changes
Merge remote-tracking branch 'ecamp/devel' into feature/doc