merge with dev

rtgui/toolpanelcoord.h

@@ -80,6 +80,7 @@
 #include "prsharpening.h"
 #include "fattaltonemap.h"
 #include "localcontrast.h"
+#include "softlight.h"
 #include "guiutils.h"
 
 class ImageEditorCoordinator;
@@ -136,6 +137,7 @@ protected:
     Wavelet * wavelet;
     DirPyrEqualizer* dirpyrequalizer;
     HSVEqualizer* hsvequalizer;
+    SoftLight *softlight;
     FilmSimulation *filmSimulation;
     SensorBayer * sensorbayer;
     SensorXTrans * sensorxtrans;