Merge pull request #163 from joergkappes/master

bugfixes combilp
Update ChangeLog.txt
Merge pull request #1 from opengm/master

getting OpenGM update