Now using a DllMain method for the DLL
Merge branch 'master' into dev-sane

Conflicts:
	src/imgscanner/ImgScanner.cpp
	src/imgscanner/ImgScannerTwain.cpp
	src/imgscanner/ImgScannerTwain.h