Merge branch 'master' of newgeom:newgeom.git

diff --cc src/Model/Model_Document.cpp
Simple merge

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

diff --cc src/SketchSolver/SketchSolver_ConstraintManager.cpp
Simple merge

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

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