nada
Esse caralho n sincroniza
Merge remote-tracking branch 'origin/master'

Conflicts:
	AutoPI-ejb/nbproject/private/private.properties
	AutoPI-ejb/nbproject/project.properties
	AutoPI-war/nbproject/private/private.properties
	AutoPI-war/nbproject/project.properties
	AutoPI-war/web/admin/cadastrarUsuario.xhtml
	AutoPI-war/web/admin/estilos/estilo.css
	nbproject/private/private.properties
	nbproject/project.properties
Merge branch 'master' into muriloBranch