Merge branch 'master' of newgeom:newgeom.git

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

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

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

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