Gerhard First Commit
C0mm1t!!
Merge branch 'Robert' into development

Conflicts:
	DOC.txt