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

Imported SAREF, SAREF4CITY and SAREF4SYST and removed the declarations of their terms

Closes #7

See merge request !5