Merge branch 'feature/script-manager' into feature/script-live

# Conflicts:
#	cmake/qet_compilation_vars.cmake
#	sources/qetdiagrameditor.cpp
#	sources/ui/configpage/generalconfigurationpage.cpp

sources/qetdiagrameditor.cpp

@@ -21,6 +21,7 @@
 #include "scripting/scriptlibrary.h"
 #include "scripting/scriptmanagerdialog.h"
 #include "scripting/liveserver.h"
+#include "scripting/assistantinfo.h"
 #endif
 #include <QCoreApplication>
 #include <QToolButton>
@@ -1386,6 +1387,7 @@ void QETDiagramEditor::setUpMenu()
 	rebuildScriptActions();
 	connect(&ScriptLibrary::instance(), &ScriptLibrary::changed,
 		this, &QETDiagramEditor::rebuildScriptActions);
+	AssistantInfo::watch();
 #endif
 #ifdef QET_EXPORT_PROJECT_DB
 	menu_project -> addSeparator();