Merge branch 'master' of newgeom:newgeom.git

diff --cc src/GeomAPI/GeomAPI_Shape.h
Simple merge

diff --cc src/Model/Model_Validator.h
Simple merge

diff --cc src/ModelAPI/ModelAPI_Feature.h
Simple merge

diff --cc src/ModelAPI/ModelAPI_Validator.h
Simple merge

diff --cc src/SketchPlugin/SketchPlugin_ConstraintDistance.h
Simple merge

diff --cc src/SketchPlugin/SketchPlugin_Sketch.h
Simple merge

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