integration of the barcode scanner
test commit
back to normal
Merge branch 'barcode'
merge