Merge branch 'master' into dev_local

Conflicts:
	src/BusinessLogic/Engine.cpp

diff --cc src/BusinessLogic/Engine.cpp
index 19f8250,25c3048..911b49b
--- 1/src/BusinessLogic/Engine.cpp
--- 2/src/BusinessLogic/Engine.cpp
+++ b/src/BusinessLogic/Engine.cpp
@@@ -288,17 -276,11 +288,19 @@@ void Engine::errorHandler( int aCode, c
  {
        qDebug() << "Engine::ErrorHandler, aCode: " << aCode;
        // inform UI about the problem
-       if( aCode >= 100 && aCode <= 150 )
+       if( aCode >= 100 && aCode <= 150 ) { //communication errors
 +      {
+               //we don't want these to close operation changing
                qDebug() << "CommunicationManager signaled an error:" << aCode;
 +              if( !iCommunicationFailed )
 +              {
 +                      // Only inform window manager when first error appears
 +                      iCommunicationFailed = true;
 +                      //iWindowManager->connectionLost();
 +              }
 +      }
-       iWindowManager->closeProgressBar();
+               iWindowManager->closeProgressBar();
+       }
        iWindowManager->error( ErrorMapper::codeToString( aCode, aAddInfo ) );
  }
  

diff --cc src/BusinessLogic/Engine.h
Simple merge

diff --cc src/UserInterface/WindowManager.cpp
Simple merge