Merge branch 'master_merge' into dev_puontsi

Conflicts:
	src/Domain/Configuration/Configuration.cpp
	src/Domain/Configuration/DateTimeSettings.cpp

diff --cc QtMeetings.pro
Simple merge

diff --cc src/Domain/Configuration/DateTimeSettings.cpp
index 21c3c6e,6cf5f1c..b885e6b
--- 1/src/Domain/Configuration/DateTimeSettings.cpp
--- 2/src/Domain/Configuration/DateTimeSettings.cpp
+++ b/src/Domain/Configuration/DateTimeSettings.cpp
@@@ -82,5 -113,8 +113,8 @@@ void DateTimeSettings::setDayOfWeek(con
  
  QString DateTimeSettings::dayOfWeek()
  {
+ 
+       qDebug() << "DateTimeSettings::dayOfWeek: " +this->iDayOfWeek;
+ 
 -      return (this->iDayOfWeek);
 +      return(this->iDayOfWeek);
  }