Updated scan activity. Now returns the barcode string properly.
Merge branch 'dev-backend' into Scanning
Not entirely sure what I did
Merge branch 'master' into dev-backend