changes to user barcode scan
Merge pull request #280 from david-allen-tessella/rerack_fix

Reracking fix
Merge branch 'master' into uat_release