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/diagonalcurveeditorsubgroup.h

@@ -29,14 +29,13 @@ class DiagonalCurveEditorSubGroup : public CurveEditorSubGroup, public SHCListen
 	friend class DiagonalCurveEditor;
 
 protected:
-	Gtk::HBox* customCurveBox;
+	Gtk::VBox* customCurveBox;
+	Gtk::VBox* NURBSCurveBox;
 	Gtk::VBox* paramCurveBox;
-	Gtk::HBox* paramInnerBox;
-	Gtk::HBox* NURBSCurveBox;
 
 	MyDiagonalCurve* customCurve;
-	MyDiagonalCurve* paramCurve;
 	MyDiagonalCurve* NURBSCurve;
+	MyDiagonalCurve* paramCurve;
 
 	SHCSelector* shcSelector;
 	Adjuster* highlights;
@@ -60,7 +59,7 @@ protected:
 	int activeParamControl;
 
 public:
-	DiagonalCurveEditorSubGroup(CurveEditorGroup* prt);
+	DiagonalCurveEditorSubGroup(CurveEditorGroup* prt, Glib::ustring& curveDir);
 	virtual ~DiagonalCurveEditorSubGroup();
 
 	DiagonalCurveEditor* addCurve(Glib::ustring curveLabel = "");