changed to UNIX end-of-line style
improved FindCPLEX.cmake on Windows
Merge pull request #164 from ukoethe/master

cmake improvements for Windows
Merge pull request #2 from opengm/master

getting updates from master repo