Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

diff --cc src/ModuleBase/ModuleBase_IModule.cpp
Simple merge

diff --cc src/ModuleBase/ModuleBase_IModule.h
Simple merge

diff --cc src/ModuleBase/ModuleBase_IWorkshop.h
Simple merge

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

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

diff --cc src/XGUI/XGUI_ModuleConnector.cpp
Simple merge

diff --cc src/XGUI/XGUI_OperationMgr.cpp
Simple merge

diff --cc src/XGUI/XGUI_OperationMgr.h
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge

diff --cc src/XGUI/XGUI_Workshop.h
Simple merge