Merge pull request #66 from joergkappes/RC2.1

bugfixes
Merge pull request #1 from opengm/RC2.1

Rc2.1
bugfix blckboxtest, and trwsi,adsal and primal-lpbound code
Merge branch 'RC2.1' of github.com:homul/opengm into RC2.1
Merge pull request #67 from homul/RC2.1

TRWS/ADSAL
Merge pull request #6 from opengm/RC2.1

Rc2.1