aaaa
Merge branch 'master' of https://github.com/sniciq/YCDecode

Conflicts:
	jni/YCDecode.cpp
	jni/com_yctimes_autocamera_BarCodeDecoder.h
	src/com/yctimes/autocamera/BarCodeDecoder.java
改名成：OYCDecode