Changed comment error in class JavaDoc
Merge branch 'datamodel' into development