Changed the timeout amount for scanning barcodes back to production value.
Merge branch 'iss#02'