Merge branch 'master' into Dev_1.1.0

Conflicts:
	src/PartSet/PartSet_WidgetSketchLabel.cpp

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

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

diff --cc src/ModuleBase/ModuleBase_IModule.h
index 01896bb8fa3610406fe3e357df9130c9eeff5704,b500dd6f82ae3f97b4dbcb1498eabbf87925f4cc..32c7cdcbfb7df17206a47373efb8f5b4d516ee3a
--- 1/src/ModuleBase/ModuleBase_IModule.h
--- 2/src/ModuleBase/ModuleBase_IModule.h
+++ b/src/ModuleBase/ModuleBase_IModule.h
@@@ -127,10 -127,10 +127,13 @@@ protected slots
  \r
    /// Register selection filters for this module\r
    virtual void registerFilters() {}\r
+ 
+   /// Register properties of this module
+   virtual void registerProperties() {}
  \r
 +  /// Register properties of this module\r
 +  virtual void registerProperties() {}\r
 +\r
    /// Returns new instance of operation object (used in createOperation for customization)\r
    virtual ModuleBase_Operation* getNewOperation(const std::string& theFeatureId);\r
  \r

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

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