fix for test
Merge branch 'dev-no-dpi'

Conflicts:
	src/test/TestDmScanLib.cpp
fix decoder

now decode options are used correctly in Decoder::createDmtxDecode()
JAVA_HOME now set to /usr/lib/jvm/java-6-oracle
Merge branch 'master' into dev-no-dpi