Merge branch 'master' of https://github.com/Healbadbad/BluetoothTag.git

Conflicts:
	bin/BluetoothTag.apk
	bin/classes.dex
	bin/resources.ap_
Merge branch 'master' of https://github.com/Healbadbad/BluetoothTag.git