Inicio desenvolvimento leitura dos dispositivos
	new file:   WebContent/WEB-INF/lib/RXTXcomm.jar
	new file:   WebContent/WEB-INF/lib/modbus4J.jar
	new file:   WebContent/WEB-INF/lib/quartz-2.2.0.jar
	new file:   WebContent/WEB-INF/lib/quartz-jobs-2.2.0.jar
	new file:   WebContent/WEB-INF/lib/seroUtils.jar
	modified:   WebContent/WEB-INF/web.xml
	new file:   WebContent/listar/ListarAgendador.xhtml
	modified:   WebContent/listar/ListarTipoDispositivo.xhtml
	new file:   WebContent/manter/ManterAgendador.xhtml
	modified:   WebContent/manter/ManterDispositivo.xhtml
	new file:   WebContent/manter/RodarLeitura.xhtml
	modified:   src/Resources_pt.properties
	new file:   src/br/com/controle/mes/bean/AgendadorBean.java
	new file:   src/br/com/controle/mes/bean/DadosLeituraDispositivoBean.java
	modified:   src/br/com/controle/mes/bean/DispositivoBean.java
	new file:   src/br/com/controle/mes/converter/AgendadorConverter.java
	new file:   src/br/com/controle/mes/converter/ConfiguracaoPortaConverter.java
	new file:   src/br/com/controle/mes/converter/DispositivoConverter.java
	new file:   src/br/com/controle/mes/converter/TipoDispositivoConverter.java
	new file:   src/br/com/controle/mes/dao/AgendadorDAO.java
	modified:   src/br/com/controle/mes/dao/DispositivoDAO.java
	new file:   src/br/com/controle/mes/enumerate/OrigemDadosLeitura.java
	new file:   src/br/com/controle/mes/enumerate/StatusDadosLeitura.java
	new file:   src/br/com/controle/mes/model/Agendador.java
	new file:   src/br/com/controle/mes/model/DadosLeituraDispositivo.java
	modified:   src/br/com/controle/mes/model/Dispositivo.java
	modified:   src/br/com/controle/mes/model/TipoDispositivo.java
	new file:   src/br/com/controle/mes/model/Turno.java
	new file:   src/br/com/controle/mes/util/SchedulerJob.java
	new file:   src/br/com/controle/mes/validator/AgendadorValidator.java
	new file:   src/quartz-config.xml
	new file:   src/quartz.properties
Merge branch 'master' of github.com:fecsix/mes

Conflicts:
	WebContent/WEB-INF/web.xml
	build/classes/Resources_pt.properties
	build/classes/br/com/controle/mes/dao/DispositivoDAO.class
	src/Resources_pt.properties