Barcode Scanner and stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	CheckoutApp/bin/Checkout.apk
	CheckoutApp/bin/classes.dex
	CheckoutApp/bin/classes/com/example/checkout/ShowLogs.class
	CheckoutApp/bin/resources.ap_