Server
Merge branch 'Server'

Conflicts:
	src/main/java/br/com/sheeva/dominio/Servidor.java
	src/main/webapp/pages/servidor/cadastrar-servidor-formulario.xhtml
	src/main/webapp/pages/servidor/cadastrar-servidor-lista.xhtml
Resolvido bugs gerados