WebContent/listar/ListarFornecedor.xhtml
	WebContent/manter/ManterFornecedor.xhtml
	src/br/com/controle/mes/bean/FornecedorBean.java
	src/br/com/controle/mes/model/CentroDeTrabalho.java
	src/br/com/controle/mes/model/Fornecedor.java
Atualizacao Derli
	new file:   WebContent/listar/ListarFornecedor.xhtml
	new file:   WebContent/manter/ManterFornecedor.xhtml
	new file:   src/br/com/controle/mes/bean/FornecedorBean.java
	new file:   src/br/com/controle/mes/model/CentroDeTrabalho.java
	new file:   src/br/com/controle/mes/model/Fornecedor.java
Merge branch 'master' of github.com:fecsix/mes

Conflicts:
	build/classes/br/com/controle/mes/model/CentroDeTrabalho.class

	new file:   WebContent/listar/ListarConfiguracaoPorta.xhtml
	new file:   WebContent/listar/ListarDispositivo.xhtml
	new file:   WebContent/listar/ListarTipoDispositivo.xhtml
	new file:   WebContent/manter/ManterConfiguracaoPorta.xhtml
	new file:   WebContent/manter/ManterDispositivo.xhtml
	new file:   WebContent/manter/ManterTipoDispositivo.xhtml
	modified:   src/br/com/controle/mes/bean/ComumBean.java
	new file:   src/br/com/controle/mes/bean/ConfiguracaoPortaBean.java
	new file:   src/br/com/controle/mes/bean/DispositivoBean.java
	new file:   src/br/com/controle/mes/bean/TipoDispositivoBean.java
	modified:   src/br/com/controle/mes/model/CentroDeTrabalho.java
	new file:   src/br/com/controle/mes/model/ConfiguracaoPorta.java
	new file:   src/br/com/controle/mes/model/Dispositivo.java
	modified:   src/br/com/controle/mes/model/Fornecedor.java
	new file:   src/br/com/controle/mes/model/TipoDispositivo.java
	WebContent/listar/ListarCentroTrabalho.xhtml
	WebContent/listar/ListarRecurso.xhtml
	WebContent/manter/ManterCentroTrabalho.xhtml
	WebContent/manter/ManterRecurso.xhtml
	src/br/com/controle/mes/bean/CentroDeTrabalhoBean.java
	src/br/com/controle/mes/bean/RecursoBean.java
	src/br/com/controle/mes/converter/FornecedorConverter.java
	src/br/com/controle/mes/enumerate/TipoCentroTrabalho.java
	src/br/com/controle/mes/model/Recurso.java
	new file:   WebContent/listar/ListarCentroTrabalho.xhtml
	new file:   WebContent/listar/ListarRecurso.xhtml
	new file:   WebContent/manter/ManterCentroTrabalho.xhtml
	new file:   WebContent/manter/ManterRecurso.xhtml
	new file:   src/br/com/controle/mes/bean/CentroDeTrabalhoBean.java
	new file:   src/br/com/controle/mes/bean/RecursoBean.java
	new file:   src/br/com/controle/mes/converter/FornecedorConverter.java
	new file:   src/br/com/controle/mes/enumerate/TipoCentroTrabalho.java
	new file:   src/br/com/controle/mes/model/Recurso.java