olol
Merge branch 'master' of https://github.com/reinerwaldmann/PHDFingerprintSuite

Conflicts:
	mainwindow.cpp
ololo
fx