Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/XGUI/XGUI_Workshop.cpp

diff --cc src/XGUI/XGUI_Workshop.cpp
index 7f936b82cb6f21823d1b49af73216b4f2e94a00e,ecf8524964668aba6387a308a8393c947c2c479e..8b3fd9ac3a404dbab6103121b17f8f0da09d4d81
--- 1/src/XGUI/XGUI_Workshop.cpp
--- 2/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -7,12 -7,11 +7,14 @@@
  #include "XGUI_Workbench.h"
  #include "XGUI_Workshop.h"
  #include "XGUI_Viewer.h"
+ #include "XGUI_WidgetFactory.h"
  
- #include <Config_FeatureMessage.h>
 +#include <ModelAPI_PluginManager.h>
 +#include <ModelAPI_Feature.h>
 +
  #include <Event_Loop.h>
+ #include <Config_FeatureMessage.h>
+ #include <Config_WidgetMessage.h>
  
  #include <QApplication>
  #include <QFileDialog>