1
Merge branch 'master' of https://github.com/shenyichieh/BarcodeScanningAPP

Conflicts:
	bin/classes/com/example/barcodescanningapp/ProductInfoActivity.class
	bin/classes/com/example/barcodescanningapp/R$drawable.class
	bin/classes/com/example/barcodescanningapp/R$id.class
	bin/classes/com/example/barcodescanningapp/R$integer.class
	bin/classes/com/example/barcodescanningapp/R$layout.class
	bin/classes/com/example/barcodescanningapp/R$menu.class
	bin/classes/com/example/barcodescanningapp/R$string.class
	bin/classes/com/example/barcodescanningapp/R$style.class
	gen/com/example/barcodescanningapp/R.java
	src/com/example/barcodescanningapp/ProductInfoActivity.java