added barcode scan
Merge remote-tracking branch 'origin/develop' into jet
barcode + edit + delete
Merge remote-tracking branch 'origin/develop' into jxy
pull with jet