Alteração lay v6
Merge branch 'master' of https://github.com/rmuchoa/Frota

Conflicts:
	GestaoFrota/web/pages/usuario/formulario.xhtml