Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default

This revision compiles and runs on Win7x64- but further evaluation is necessary.
There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder.
Additional notes:
- ImProcFunctions::hsv2rgb01   -> this likely need to be added to color.h & color.cc
- Use of array2D should be verified in NR code
- compilation warning for rtengine::RawImageSource::isWBProviderReady()

rtgui/addsetids.h

@@ -49,11 +49,10 @@
 #define ADDSET_SHARPENMICRO_UNIFORMITY	39
 #define ADDSET_VIBRANCE_PASTELS			40
 #define ADDSET_VIBRANCE_SATURATED		41
-#define ADDSET_VIBRANCE_PSTHRESHOLD		42
-#define ADDSET_FREE_OUPUT_GAMMA			43
-#define ADDSET_FREE_OUTPUT_SLOPE		44
+#define ADDSET_FREE_OUPUT_GAMMA			42
+#define ADDSET_FREE_OUTPUT_SLOPE		43
 
 // When adding items, make sure to update ADDSET_PARAM_NUM
-#define ADDSET_PARAM_NUM		45 // THIS IS USED AS A DELIMITER!!
+#define ADDSET_PARAM_NUM		44 // THIS IS USED AS A DELIMITER!!
 
 #endif