Merge branch 'master' into taVideoThread

Conflicts:
	.doxygen
	app/Joker/Joker.pro
	app/Joker/VideoStripView.cpp
	libs/PhVideo/PhVideo.pri
	libs/PhVideo/PhVideoEngine.cpp
	libs/PhVideo/PhVideoEngine.h
	libs/PhVideo/PhVideoView.cpp
	tests/AutoTest/AutoTest.pro
	tests/AutoTest/VideoTest.cpp
	tests/AutoTest/VideoTestSettings.h
	tests/AutoTest/main.cpp
	tests/VideoSyncTest/VideoSyncTestSettings.h
	tests/VideoTest/VideoTestWindow.cpp
post merge fix
Now pass the tests