Merge branch 'master' into qt5

diff --cc src/gui/eventdialog.cpp
Simple merge

diff --cc src/gui/mainwindow.h
index 5c657721fc23823a88bebbf3b75ff13b57d9a0e4,537d81e793f9cd3961ea1b25c858154951d44122..09203e406aa44bb830040dd102029c66fe7afb2a
--- 1/src/gui/mainwindow.h
--- 2/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@@ -20,7 -20,8 +20,8 @@@
  #ifndef MAINWINDOW_H
  #define MAINWINDOW_H
  
 -#include <QtGui/QMainWindow>
 +#include <QtWidgets>
+ #include <QSslError>
  
  #include "ui_mainwindow.h"
  

diff --cc src/gui/searchhead.h
Simple merge

diff --cc src/mvc/conferencemodel.h
Simple merge

diff --cc src/mvc/delegate.cpp
Simple merge

diff --cc src/mvc/delegate.h
Simple merge

diff --cc src/mvc/eventmodel.cpp
Simple merge

diff --cc src/sql/sqlengine.cpp
Simple merge