Show unit names in SAM for measurements and features
Merge branch 'plugin' of https://github.com/thehyve/SAM into plugin