Gerhard First Commit
Merge branch 'Robert' into development

Conflicts:
	DOC.txt