Ajuste para fazer o pull
Merge branch 'master' of https://github.com/williamrodrigues/JCadProject

Conflicts:
	.settings/org.eclipse.core.resources.prefs