Merge remote-tracking branch 'remotes/origin/Filters_Development_2'

# Conflicts:
#	src/FeaturesPlugin/CMakeLists.txt
#	src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Recover.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Validators.cpp
#	src/GeomAlgoAPI/CMakeLists.txt
#	src/ModuleBase/CMakeLists.txt
#	src/XGUI/XGUI_ActiveControlMgr.cpp
#	src/XGUI/XGUI_Workshop.cpp
#	src/XGUI/XGUI_pictures.qrc

diff --cc src/GeomAPI/GeomAPI_Edge.cpp
Simple merge

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

diff --cc src/ModuleBase/CMakeLists.txt
index 081f37b25c36c2cccdb87ca141a51b2d9b8ad82b,e36810a0aaf78764499ba3ea2ec190d8dc0b20e6..f8a1ff2c4d66fb68cb814c3c6e1a9296db2ba35a
--- 1/src/ModuleBase/CMakeLists.txt
--- 2/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@@ -103,7 -103,7 +103,8 @@@ SET(PROJECT_HEADER
    ModuleBase_WidgetRadiobox.h
    ModuleBase_WidgetPointInput.h
    ModuleBase_ITreeNode.h
+   ModuleBase_WidgetSelectionFilter.h
 +  ModuleBase_IStepPrs.h
  )
  
  SET(PROJECT_MOC_HEADERS
@@@ -221,7 -222,7 +223,8 @@@ SET(PROJECT_SOURCE
    ModuleBase_WidgetNameEdit.cpp
    ModuleBase_WidgetRadiobox.cpp
    ModuleBase_WidgetPointInput.cpp
+   ModuleBase_WidgetSelectionFilter.cpp
 +  ModuleBase_IStepPrs.cpp
  )
  
  SET(PROJECT_LIBRARIES

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

diff --cc src/XGUI/XGUI_ActiveControlMgr.cpp
index 775985d76c44bef1dbbea65d8de1b7d18778feb0,a976b6c3f62b9db19384136514fd81c371431449..b79971cf2b7bd08836b4d903939f9094567db700
--- 1/src/XGUI/XGUI_ActiveControlMgr.cpp
--- 2/src/XGUI/XGUI_ActiveControlMgr.cpp
+++ b/src/XGUI/XGUI_ActiveControlMgr.cpp
@@@ -104,9 -110,8 +110,8 @@@ void XGUI_ActiveControlMgr::deactivateS
    activateSelector(NULL);
  
    XGUI_ActiveControlSelector* aSelectorToBeActivated = 0;
-   for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
-   {
+   for (int i = 0, aCount = mySelectors.count(); i < aCount; i++) {
 -    if (!mySelectors[i]->needToBeActiated())
 +    if (!mySelectors[i]->needToBeActivated())
        continue;
      aSelectorToBeActivated = mySelectors[i];
      break;

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

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

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

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

diff --cc src/XGUI/XGUI_pictures.qrc
index 2e088049613466b3ac2faddf9a58d61b66706b8b,b8163172b4a4379ee5d8c26ee97f72bdaeb1381b..acb22325c73f3f8beae5b76342a4f898c265da88
--- 1/src/XGUI/XGUI_pictures.qrc
--- 2/src/XGUI/XGUI_pictures.qrc
+++ b/src/XGUI/XGUI_pictures.qrc
@@@ -83,8 -85,7 +85,10 @@@
       <file>pictures/arrow-up.png</file>
       <file>pictures/arrow-down.png</file>
       <file>pictures/configure_toolbars.png</file>
+      <file>pictures/add.png</file>
+      <file>pictures/reverce.png</file>
 +     <file>pictures/color.png</file>
 +     <file>pictures/normal-view-inversed.png</file>
 +     <file>pictures/normal-view.png</file>
   </qresource>
   </RCC>