added core_3.1.1_snapshot jar as library
Merge remote-tracking branch 'qr-scanner/ry' into direct

Conflicts:
	app/build.gradle