Merge branch 'master' into qt5

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

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

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