Api 2
Merge branch 'master' of https://github.com/gabrik/btSensor

Conflicts:
	.DS_Store
	BluetoothSensor/.DS_Store
	BluetoothSensor/bin/BluetoothSensor.apk
	BluetoothSensor/bin/classes.dex
	BluetoothSensor/bin/resources.ap_