Ajustes finais
Merge remote-tracking branch 'origin/master' into octree

Conflicts:
	metalslender.py