preparation to merge MT version
Beta7
Fixed cie94 color distance
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main.cpp
	src/rasta.cpp
	src/rasta.h