Merge pull request #201 from joergkappes/RC-2.3

Rc 2.3
Windows template parameters for std::max

Added template parameter to std::max (i.e. std::max<ValueType>), which was already present for std::min.
This is required to compile under Windows.
Merge pull request #202 from yanlend/patch-1

Windows template parameters for std::max
Merge pull request #21 from opengm/RC-2.3

from rc2.3
Fixed bugs on python wrapper side:

	- unit tests work again (bug in python glue code has been fixed)
	- gm_manipulator bug fixed (gm has been unlocked)
removed couts/prints
started changelog for rc2.3
Merge pull request #205 from DerThorsten/master

fixed bugs in python wrapper
implmented addLog and log
Merge pull request #206 from DerThorsten/master

implmented addLog and log
Merge pull request #54 from opengm/RC-2.3

update from master