Telas de Apontamentos
	new file:   WebContent/_templateApontamento.xhtml
	new file:   WebContent/apontamento/MenuApontamento.xhtml
	new file:   WebContent/loginApontamento.xhtml
	modified:   src/GeraDados.java
	modified:   src/Resources_en.properties
	modified:   src/Resources_es.properties
	modified:   src/Resources_pt.properties
	new file:   src/br/com/controle/mes/bean/ApontamentoHoraBean.java
	modified:   src/br/com/controle/mes/bean/ConstantsBean.java
	modified:   src/br/com/controle/mes/bean/LoginBean.java
	modified:   src/br/com/controle/mes/dao/UsuarioDAO.java
	modified:   src/br/com/controle/mes/listener/Autorizador.java
	modified:   src/br/com/controle/mes/model/Item.java
	modified:   src/br/com/controle/mes/model/Usuario.java
	modified:   src/br/com/controle/mes/util/BuscarAnotacoes.java
	modified:   src/br/com/controle/mes/util/ValidaCampo.java
Merge branch 'master' of github.com:fecsix/mes
Merge branch 'master' of github.com:fecsix/mes
Merge branch 'master' of github.com:fecsix/mes
Apontamento Hora Indireta
	modified:   WebContent/_template.xhtml
	modified:   WebContent/_templateApontamento.xhtml
	new file:   WebContent/apontamento/ApontamentoHoraIndireta.xhtml
	modified:   WebContent/apontamento/MenuApontamento.xhtml
	modified:   WebContent/listar/ListarTarefa.xhtml
	modified:   WebContent/loginApontamento.xhtml
	modified:   WebContent/manter/ManterTarefa.xhtml
	modified:   WebContent/resources/css/style.css
	new file:   WebContent/resources/imagens/LgoCainco.jpg
	modified:   src/GeraDados.java
	modified:   src/Resources_en.properties
	modified:   src/Resources_es.properties
	modified:   src/Resources_pt.properties
	new file:   src/br/com/controle/mes/bean/ApontamentoBean.java
	deleted:    src/br/com/controle/mes/bean/ApontamentoHoraBean.java
	modified:   src/br/com/controle/mes/bean/ComumBean.java
	modified:   src/br/com/controle/mes/bean/InternacionalizacaoBean.java
	modified:   src/br/com/controle/mes/bean/LoginBean.java
	new file:   src/br/com/controle/mes/bean/StatusBean.java
	modified:   src/br/com/controle/mes/bean/TarefaBean.java
	modified:   src/br/com/controle/mes/bean/UsuarioBean.java
	modified:   src/br/com/controle/mes/bean/UsuarioLogado.java
	new file:   src/br/com/controle/mes/dao/ApontamentoDAO.java
	new file:   src/br/com/controle/mes/dao/FuncionarioDAO.java
	modified:   src/br/com/controle/mes/dao/RecursoDAO.java
	new file:   src/br/com/controle/mes/dao/StatusDAO.java
	modified:   src/br/com/controle/mes/dao/TarefaDAO.java
	new file:   src/br/com/controle/mes/dao/TipoApontamentoDAO.java
	modified:   src/br/com/controle/mes/dao/UsuarioDAO.java
	new file:   src/br/com/controle/mes/enumerate/StatusEnum.java
	new file:   src/br/com/controle/mes/enumerate/TipoApontamentoEnum.java
	renamed:    src/br/com/controle/mes/enumerate/TipoCentroTrabalho.java -> src/br/com/controle/mes/enumerate/TipoCentroTrabalhoEnum.java
	modified:   src/br/com/controle/mes/enumerate/TipoItem.java
	new file:   src/br/com/controle/mes/enumerate/TipoStatus.java
	new file:   src/br/com/controle/mes/model/Apontamento.java
	modified:   src/br/com/controle/mes/model/CentroTrabalho.java
	modified:   src/br/com/controle/mes/model/Fornecedor.java
	new file:   src/br/com/controle/mes/model/Funcionario.java
	modified:   src/br/com/controle/mes/model/Recurso.java
	new file:   src/br/com/controle/mes/model/Status.java
	modified:   src/br/com/controle/mes/model/Tarefa.java
	new file:   src/br/com/controle/mes/model/TipoApontamento.java
	new file:   src/br/com/controle/mes/model/TipoCentroTrabalho.java
	new file:   src/br/com/controle/mes/model/TipoStatus.java
	modified:   src/br/com/controle/mes/model/Turno.java
	modified:   src/br/com/controle/mes/model/Usuario.java
	modified:   src/quartz-config.xml