Merge branch 'master' into master_merge

diff --combined QtMeetings.pro
index 5aa48d3,121575b..b4c6c65
--- 1/QtMeetings.pro
--- 2/QtMeetings.pro
+++ b/QtMeetings.pro
@@@ -13,14 -13,14 +13,15 @@@ INCLUDEPATH += src/Domain/ 
      src/UserInterface/Components/ \
      src/UserInterface/Utils/ \
      src/UserInterface/Views/
- HEADERS += src/IO/DeviceControl/OperationModeToggler.h \
+ HEADERS += src/BusinessLogic/UIManager.h \
+     src/IO/DeviceControl/OperationModeToggler.h \
      src/UserInterface/Utils/ProgressBar.h \
      src/Domain/Room.h \
      src/Domain/Meeting.h \
      src/Domain/Configuration/ConnectionSettings.h \
      src/Domain/Configuration/StartupSettings.h \
      src/Domain/Configuration/DisplaySettings.h \
 +    src/Domain/Configuration/DateTimeSettings.h \
      src/Domain/Configuration/Configuration.h \
      src/IO/Communication/MessagingUtils.h \
      src/IO/Communication/Communication.h \
@@@ -45,15 -45,16 +46,17 @@@
      src/UserInterface/Views/WeeklyViewWidget.h \
      src/UserInterface/Views/MeetingInfoDialog.h \
      src/UserInterface/Views/SettingsView.h \
-     src/UserInterface/WindowManager.h
- SOURCES += src/IO/DeviceControl/OperationModeToggler.cpp \
+     src/UserInterface/WindowManager.h \
+     src/UserInterface/Views/ViewBase.h
+ SOURCES += src/BusinessLogic/UIManager.cpp \
+     src/IO/DeviceControl/OperationModeToggler.cpp \
      src/UserInterface/Utils/ProgressBar.cpp \
      src/Domain/Room.cpp \
      src/Domain/Meeting.cpp \
      src/Domain/Configuration/ConnectionSettings.cpp \
      src/Domain/Configuration/StartupSettings.cpp \
      src/Domain/Configuration/DisplaySettings.cpp \
 +    src/Domain/Configuration/DateTimeSettings.cpp \
      src/Domain/Configuration/Configuration.cpp \
      src/IO/Communication/MessagingUtils.cpp \
      src/IO/Communication/Communication.cpp \
@@@ -79,6 -80,7 +82,7 @@@
      src/UserInterface/Views/MeetingInfoDialog.cpp \
      src/UserInterface/Views/SettingsView.cpp \
      src/UserInterface/WindowManager.cpp \
+     src/UserInterface/Views/ViewBase.cpp \
      src/main.cpp
  RESOURCES += resources/BusinessLogic.qrc \
      resources/UserInterface.qrc