Cadastro de Funcionarios
Servlets Estado/Cidade
Correcao do Cadastro de Clientes
Envio de emails
Whathever
Cadastro usuarios
Merge branch 'master' of https://github.com/pauloNoka/jTicketMaster into pauloNoka-master

Conflicts:
	TCC/WebContent/NewClient.jsp
	TCC/WebContent/js/app.js
	TCC/src/util/Conecta.java
Mesclando codigo do Paulo ao  projeto original
header
Merge remote-tracking branch 'upstream/master'