imagetools: fixes in featuresToImage
Merge remote-tracking branch 'origin/master'
remove CMakeLists from repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	supporting_code/imagetools.hxx