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

Conflicts:
	LightBike/AndroidManifest.xml
	LightBike/src/com/example/lightbike/qrcode/zxing/camera/AutoFocusCallback.java
	LightBike/src/com/example/lightbike/qrcode/zxing/camera/PlanarYUVLuminanceSource.java
	LightBike/src/com/example/lightbike/qrcode/zxing/camera/PreviewCallback.java
	LightBike/src/com/example/lightbike/qrcode/zxing/decoding/DecodeFormatManager.java
	LightBike/src/com/example/lightbike/qrcode/zxing/decoding/FinishListener.java
	LightBike/src/com/example/lightbike/qrcode/zxing/decoding/InactivityTimer.java
	LightBike/src/com/example/lightbike/qrcode/zxing/decoding/Intents.java
	LightBike/src/com/example/lightbike/qrcode/zxing/view/ViewfinderResultPointCallback.java