Merge pull request #166 from IMOD-ASU/development

Sprint 10
increment sprint
Merge pull request #181 from IMOD-ASU/sprint-11

increment sprint