new file:   src/br/com/controle/mes/model/GrupoItem.java
	new file:   src/br/com/controle/mes/model/Item.java
	new file:   src/br/com/controle/mes/model/Unidade.java
	new file:   src/br/com/controle/mes/model/enumerate/TipoItem.java
	new file:   src/br/com/controle/mes/model/enumerate/TipoTarefa.java
Merge branch 'master' of github.com:fecsix/mes

Conflicts:
	build/classes/META-INF/persistence.xml
	src/META-INF/persistence.xml

	new file:   WebContent/listar/ListarCentroTrabalho.xhtml
	new file:   WebContent/listar/ListarFornecedor.xhtml
	new file:   WebContent/listar/ListarRecurso.xhtml
	new file:   WebContent/manter/ManterCentroTrabalho.xhtml
	new file:   WebContent/manter/ManterFornecedor.xhtml
	new file:   WebContent/manter/ManterRecurso.xhtml
	modified:   src/META-INF/persistence.xml
	new file:   src/br/com/controle/mes/bean/CentroDeTrabalhoBean.java
	modified:   src/br/com/controle/mes/bean/ComumBean.java
	new file:   src/br/com/controle/mes/bean/FornecedorBean.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/CentroDeTrabalho.java
	new file:   src/br/com/controle/mes/model/Fornecedor.java
	new file:   src/br/com/controle/mes/model/Recurso.java