cleanup
Merge branch 'razjel'

Conflicts:
	OpticalFlowHS.sln
	OpticalFlowHS/HSOpticalFlowOpenCL.hpp
	OpticalFlowHS/OpticalFlowHS.vcxproj
	OpticalFlowHS/Release/CL.read.1.tlog
	OpticalFlowHS/Release/OpticalFlowHS.exe.intermediate.manifest