Merge branch 'issue-9' into 'develop-v2.1.1'

closes #9, delete definitions of entities not in saref4envi

Closes #9

See merge request !16