MAdruga fail correcao

Conflicts:
	build/classes/Telas/cadastrardisciplina.form