Merge pull request #53 from opengm/RC-2.3

update from opengm:RC-2.3
add missing include of map
undo some wronge boost nameings
Merge pull request #201 from joergkappes/RC-2.3

Rc 2.3