Integration of RFID messaging and capture to database
Merge branch 'master' of https://github.com/killertechnology/AndroidBluetooth

Conflicts:
	bin/AndroidBluetooth.apk
	bin/classes.dex
	bin/resources.ap_