Colocado o proxy no hepic
Merge origin/0.148 into 0.148
Alteração no hepic
Colocado em produção
Merge origin/0.148 into 0.148

Conflicts:
	src/main/java/br/com/dasa/wservice/wscie/ApplicationConfig.java
Merge origin/0.148 into 0.148

Conflicts:
	src/main/java/br/com/dasa/wservice/wscie/ApplicationConfig.java
Desvio no geraamostra para a unidade LSF
Colocado a data e hora da coleta
Merge origin/master into develop

Conflicts:
	src/main/java/TesteMarcos.java
	src/main/java/br/com/dasa/timer/HepicTimer.java
	src/main/java/br/com/wservice/LoteExamesXmlReceiver.java
	src/main/java/br/com/wservice/dao/LabRequisicaoDao.java
Merge origin/master into develop

Conflicts:
	src/main/java/TesteMarcos.java
	src/main/java/br/com/dasa/timer/HepicTimer.java
	src/main/java/br/com/wservice/LoteExamesXmlReceiver.java
	src/main/java/br/com/wservice/dao/LabRequisicaoDao.java