pré-patch qui ne sert plus
Merge branch 'master' of github.com:xabufr/monopoly

Conflicts:
	src/graphics/gui/guitextitem.cpp