qr scanner
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	integration/integration.iml
	zxing-android-legacy/zxing-android-legacy.iml
	zxing-android/zxing-android.iml
qr scanner