Merge branch

Conflicts:
	Controle_Notas_web/src/br/controle/conexao/Conector.java