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()

rtengine/cplx_wavelet_level.h

@@ -25,14 +25,9 @@
 #include <algorithm>
 
 #include "gauss.h"
+#include "rt_math.h"
 
 namespace rtengine {
-	
-#undef MAX
-#undef MIN
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#define MIN(a,b) ((a) > (b) ? (b) : (a))
-#define SQR(x) ((x)*(x))
 
 	
 	//////////////////////////////////////////////////////////////////////////////