Resolve conflicts taking new release changes

CMakeHeaderFileList.cmake

CMakeLists.txt

CMakeModules/CPackConfigRpm.cmake

CMakeModules/FindCALINUX.cmake

CMakeModules/FindDMTX.cmake

CMakeModules/FindFFMPEG.cmake

CMakeModules/FindGDI.cmake

CMakeModules/FindGSL.cmake

CMakeModules/FindICONV.cmake

CMakeModules/FindIRISA.cmake

CMakeModules/FindLIBFREENECT.cmake

CMakeModules/FindMyJPEG.cmake

CMakeModules/FindMyPNG.cmake

CMakeModules/FindMyZLIB.cmake

CMakeModules/FindOpenCV2.cmake

CMakeModules/FindPTHREAD.cmake

CMakeModules/FindXML2.cmake

CMakeModules/FindZBAR.cmake

CMakeModules/OgreTools.cmake

CMakeModules/VISPConfig.cmake