Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/XGUI/XGUI_Workshop.cpp

diff --cc src/PartSet/PartSet_Module.cpp
Simple merge

diff --cc src/PartSet/PartSet_Module.h
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
index 1835a13f096d9fe0f06dce2c4f425905ebd6a412,cbc3ce14610a781abcc743f987fb50b11f665ba3..cbd6239cbb6642f88e114af2820c6fe2017cadd6
--- 1/src/XGUI/XGUI_Workshop.cpp
--- 2/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -216,13 -196,18 +216,20 @@@ void XGUI_Workshop::onOperationStarted(
  //******************************************************
  void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
  {
-   hidePropertyPanel();
-   updateCommandStatus();
+   ModuleBase_PropPanelOperation* aOperation =
+         (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation());
+ 
+   if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
+     updateCommandStatus();
+   } else {
 -    myMainWindow->hidePropertyPanel();
++    hidePropertyPanel();
+     updateCommandStatus();
  
 +  if (myMainWindow) {
      XGUI_MainMenu* aMenu = myMainWindow->menuObject();
      aMenu->restoreCommandState();
    }
++  }
  }
  
  /*