increased version number
changed package name: com.google.zxing.client =>
com.google.zxing.scanner to avoid collisions with installed ZXing apps
Merge branch 'zxing-integration' into devel