adopted to latest opengm changes
Merge branch 'master' into bekaus_mac