misc work
Merge branch 'master' of https://github.com/LivotovLabs/zxscanlib

Conflicts:
	src/com/google/zxing/client/android/DecodeThread.java
Merge branch 'master' of https://github.com/LivotovLabs/zxscanlib

Conflicts:
	src/com/google/zxing/client/android/DecodeThread.java
upgraded zxing