image
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/drawable-hdpi/ic_barcode.png
	app/src/main/res/drawable-mdpi/ic_barcode.png
	app/src/main/res/drawable-xhdpi/ic_barcode.png
	app/src/main/res/drawable-xxhdpi/ic_barcode.png
	app/src/main/res/drawable-xxxhdpi/ic_barcode.png