Confilct solved

Conflicts:
	src/BusinessLogic/UIManager.h

diff --cc src/BusinessLogic/UIManager.cpp
Simple merge

diff --cc src/BusinessLogic/UIManager.h
index b2ef8e5,a672381..837fd58
--- 1/src/BusinessLogic/UIManager.h
--- 2/src/BusinessLogic/UIManager.h
+++ b/src/BusinessLogic/UIManager.h
@@@ -35,28 -26,9 +35,23 @@@ public
        UIManager( Engine *aEngine, WindowManager *aWindowManager );
        virtual ~UIManager();
        
 +      //! Connects Device Managers signals.
 +      /*!
 +       * This method connects Device Managers signals directly to UI
 +       * components or to it selft.
 +       */
        void connectDeviceManager( DeviceManager *aDeviceManager );
 +      //! Connects Communication Managers signals.
 +      /*!
 +       * This method connects Communication Managers signals directly to UI
 +       * components or to it selft.
 +       */
        void connectCommunicationManager( CommunicationManager *aCommunicationManager );
 +      //! Shows the main view.
 +      /*!
 +       * Makes the main view visible trough WindowManager.
 +       */
        void showMainView();
-       //! Shows the progress bar.
-       /*!
-        * Shows the progress bar with given text.
-        */
-       void showProgressBar( QString aText );
  
  signals: