Corrigindo erro
Merge branch 'master' of
https://github.com/ejconsulti/locacaoEquipamentos

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