Clean up/add descriptions

Added a space
Explain Diagram vs DFDiagram in comments
Whitespace
Merge branch 'master' into dev

Conflicts:
	Diagram.php