merge with dev

rtgui/toolpanelcoord.h

@@ -80,6 +80,7 @@
 #include "filmsimulation.h"
 #include "prsharpening.h"
 #include "fattaltonemap.h"
+#include "localcontrast.h"
 #include "guiutils.h"
 
 class ImageEditorCoordinator;
@@ -122,6 +123,7 @@ protected:
     Crop* crop;
     ToneCurve* toneCurve;
     ShadowsHighlights* shadowshighlights;
+    LocalContrast *localContrast;
     Defringe* defringe;
     ImpulseDenoise* impulsedenoise;
     DirPyrDenoise* dirpyrdenoise;