Merge branch 'master' into QJson_Experiments

Conflicts:
	src/src/mainwidget.cpp

diff --cc buliscores.pro.user
Simple merge

diff --cc src/src.pro
index f90e7f5,9f49691..33e4c97
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -5,13 -5,10 +5,13 @@@ QT += phono
  
  TARGET = buliscores
  
 +CONFIG += link_pkgconfig
 +PKGCONFIG += QJson
 +
  OTHER_FILES += \
      buliscores.desktop \
-     sounds/trillerpfeife.wav \
-     sounds/tor.wav
+     sounds/trillerpfeife.mp3 \
+     sounds/tor.mp3
  
  HEADERS += \
      src/match.h \

diff --cc src/src/backendkicker.cpp
Simple merge

diff --cc src/src/mainwidget.cpp
index 6016a34,ce65de6..35f8af9
--- 1/src/src/mainwidget.cpp
--- 2/src/src/mainwidget.cpp
+++ b/src/src/mainwidget.cpp
@@@ -79,12 -76,10 +82,9 @@@ void MainWidget::mousePressEvent(QMouse
      if (event->button() == Qt::RightButton) {
          this->showSettingsDialog();
      } else {
 -//        qDebug() << "pfeife volume: " << m_audioOutput_pfeife->volume();
 -//        qDebug() << "tor volume: " << m_audioOutput_tor->volume();
 -//        qDebug() << "pfeife state: " << m_mediaObject_pfeife->state();
 -//        qDebug() << "tor state: " << m_mediaObject_pfeife->state();
 +        data.insert("BackendData", m_backend->serializableData());
 +        qWarning() << serializer.serialize(m_backend->serializableData());
 +
- 
- //        qDebug() << "current volume: " << m_audioOutput_pfeife->volume();
- //        qDebug() << "MO state: " << m_mediaObject_pfeife->state();
  //        m_mediaObject_pfeife->seek(0);
  //        if (m_settings.value("Sounds", false).toBool()) {
  //            m_mediaObject_pfeife->play();

diff --cc src/src/matchdaymodel.cpp
Simple merge