Merge remote-tracking branch 'origin/Dev_0.6.1' into Dev_0.6.1

diff --cc src/ModuleBase/CMakeLists.txt
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
index 81389750e58da4936705a001772151eefd070dfe,b04468f7d18ea5f53ac411207c6a77a9787e0365..b77c27bbdf8fcf4660233f91d6d9927a7948e063
--- 1/src/XGUI/XGUI_Workshop.cpp
--- 2/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -185,11 -185,13 +187,13 @@@ void XGUI_Workshop::startApplication(
    aLoop->registerListener(this, Events_Loop::eventByName("CurrentDocumentChanged"));
    aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOSHOW));
    aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOHIDE));
+   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SELFILTER_LOADED));
  
    registerValidators();
+ 
    // Calling of  loadCustomProps before activating module is required
    // by Config_PropManger to restore user-defined path to plugins
 -  XGUI_Preferences::loadCustomProps();
 +  ModuleBase_Preferences::loadCustomProps();
    activateModule();
    if (myMainWindow) {
      myMainWindow->show();