CSE-96:The video preview stays on, and the scanning button has two states. There is one error though, i’ll specify in JIRA.
Merge remote-tracking branch 'origin/master'