1. commit bluetooth
Merge branch 'master' of https://github.com/simonpang/light-bike

Conflicts:
	LightBike/AndroidManifest.xml