plop
Merge remote-tracking branch 'origin/Bip' into Bip

Conflicts:
	build/classes/root/Model/Node.class
	src/root/Model/Node.java