Merge branch 'master' into mdVideoThread

Conflicts:
	.doxygen
	app/Joker/Joker.pro
	libs/PhVideo/PhVideoEngine.cpp
clear oldFrame when changing deinterlace
fix deinterlace
Merge branch 'master' into mdVideoThread

Conflicts:
	libs/PhVideo/PhVideoEngine.cpp
Merge branch 'mdVideoThread' into taVideoThread

Conflicts:
	libs/PhVideo/PhVideoEngine.cpp