Moved UML diagram as part of "brown M&M rules".
Merge branch 'master' of https://github.com/hpabst/as1

Conflicts:
	as1/doc/UMLClassDiagram.png