conflit arbitre
Merge branch 'master' of https://github.com/proto3/Manhattan.git

Conflicts:
	Manhattan/bin/Arbitre/ArbitreLocal.class