Merge branch 'integrate' into 'develop-v2.1.1'

Import SAREF and don't use deprecated terms

Closes #9, #11, #12, #16, #15, #6, #5, and #10

See merge request !6