Sprint 17 commit
Merge branch 'master' of https://github.com/MeasureAuthoringTool/cmat_latest