problems with std::min
Merge branch 'master' of github.com:RhobanProject/Utils

Conflicts:
	zmq/src/platform.hpp