fontconfig check by Don Bright
Colormap functionality from pull request #816, mostly by Don Bright, includes new colormaps by shaina
new test results
Merge remote-tracking branch 'origin/master' into test3dexport

Conflicts:
	tests/CMakeLists.txt
forgot to add colormap class
Merge remote-tracking branch 'origin/master' into test3dexport