Merge pull request #39 from amida-tech/afsin

Afsin - blue-button-record new version
Merge branch 'master' into afsin-dre-refactor
Merge branch 'afsin-dre-refactor' into afsin-issue-310