Merge branch 'master' into Controller

Conflicts:
	ctt/Filter.cpp
	ctt/FilterParam.cpp
	ctt/FilterParam.h
	ctt/Player.cpp
	ctt/TimeshiftFilter.cpp
	ctt/TimeshiftFilter.h
	ctt/ctt.vcxproj
	ctt/ctt.vcxproj.filters
	cttApp/cttApp.vcxproj
	cttApp/main.cpp
	cttUnitTests/cttUnitTests.vcxproj
	cttUnitTests/cttUnitTests.vcxproj.filters
Merge branch 'Controller' of https://github.com/V02460/CTT