details
Merge branch 'master' of github.com:RhobanProject/Common

Conflicts:
	communication/Server2.cpp