commiting refs #1500
Merge branch 'docu' into develop
Merge branch 'develop'