Finish Feature-1

Conflicts:
	src/main/webapp/acs/Backup/deleteAcs.xhtml
	src/main/webapp/acs/backup/deleteAcs.xhtml
	src/main/webapp/acs/deleteAcs.xhtml
	src/main/webapp/acs/newAcs.xhtml
	src/main/webapp/acs/searchAcs.xhtml
	src/main/webapp/acs/startAcs.xhtml
	src/main/webapp/acs/updateAcs.xhtml
	src/main/webapp/doenca/newDoenca.xhtml
	src/main/webapp/doenca/searchDoenca.xhtml
	src/main/webapp/doenca/startDoenca.xhtml
	src/main/webapp/doenca/updateDoenca.xhtml
	src/main/webapp/endereco/Backup/deleteEndereco.xhtml
	src/main/webapp/endereco/backup/deleteEndereco.xhtml
	src/main/webapp/endereco/deleteEndereco.xhtml
	src/main/webapp/endereco/newEndereco.xhtml
	src/main/webapp/endereco/searchEndereco.xhtml
	src/main/webapp/endereco/startEndereco.xhtml
	src/main/webapp/endereco/updateEndereco.xhtml
	src/main/webapp/escolaridade/newEscolaridade.xhtml
	src/main/webapp/escolaridade/searchEscolaridade.xhtml
	src/main/webapp/escolaridade/startEscolaridade.xhtml
	src/main/webapp/escolaridade/updateEscolaridade.xhtml
	src/main/webapp/index.xhtml
	src/main/webapp/raca/newRaca.xhtml
	src/main/webapp/raca/searchRaca.xhtml
	src/main/webapp/raca/startRaca.xhtml
	src/main/webapp/raca/updateRaca.xhtml
	src/main/webapp/vinculo/newVinculo.xhtml
	src/main/webapp/vinculo/searchVinculo.xhtml
	src/main/webapp/vinculo/startVinculo.xhtml
	src/main/webapp/vinculo/updateVinculo.xhtml
Melhoria menu active