.
.
Merge commit '9b76d1517aa1b98f8c31a3afbb4c80e241df37a4'

Conflicts:
	3DTools/.classpath
	3DTools/tools3d/hud/Canvas3D2D.java