Diagram classes
Merge remote-tracking branch 'fkarpinski/RELEASE-3.0-beta2' into RELEASE-2.1-JSP
generation process diagram data