late night
Merge branch 'master' of https://github.com/Gladdy/Generic-Input-Device

Conflicts:
	Qt/DisplayInput/DisplayInput/DisplayInput.pro.user
	Qt/DisplayInput/DisplayInput/DisplayInput.pro.user.1a03450
	Qt/DisplayInput/DisplayInput/db/dbdisplay.cpp
	Qt/DisplayInput/DisplayInput/db/dbdisplay.h
	Qt/DisplayInput/DisplayInput/db/dbviewer.cpp
	Qt/DisplayInput/DisplayInput/dbviewer.ui