adding marble diagrams to javadocs; standardizing formatting & terminology
Merge branch 'docs'
Merge remote-tracking branch 'origin/master'