Merge branch 'master' into dev_local

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

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

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

diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.cpp
Simple merge

diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.h
index 4740f1f,73957b6..4d8966c
--- 1/src/UserInterface/Views/RoomStatusIndicatorWidget.h
--- 2/src/UserInterface/Views/RoomStatusIndicatorWidget.h
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.h
@@@ -60,14 -60,10 +60,16 @@@ public slots
         */\r
        void statusChanged( const Room::Status aStatus, const QTime aUntil );\r
        \r
+       void currentRoomChanged( Room *aRoom );\r
+       \r
        void viewResized(const QSize &newSize, const QSize &oldSize) { }\r
  \r
 +      void connectionEstablished();\r
 +      \r
 +      void connectionLost();\r
 +      \r
 +      void currentRoomChanged( Room *aRoom );\r
 +      \r
  private:\r
        //! Translates the status into human readable text.\r
        /*!\r