。。。
Merge branch 'master' of git@github.com:suntinghui/LYY4Android_SCAN.git

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	src/com/people/lyy/scan/activity/CaptureActivity.java