Added barcode scanning and fixed issues for Pallet Controller
merged conflicts for pbxproject file
merged conflicts for pbxproject file