Estado Situacion Programa#
Merge branch 'master' of https://github.com/camurro/minsal-divap

sdf
reportes#
reportes#
Merge branch 'master' of https://github.com/camurro/minsal-divap

Conflicts:
	BDT-JPA/src/cl/minsal/divap/model/ConvenioComuna.java
	BDT-JPA/src/cl/minsal/divap/model/ProgramaMunicipalCoreComponente.java
	BDT-ejb/ejbModule/minsal/divap/dao/AntecedentesComunaDAO.java
	BDT-ejb/ejbModule/minsal/divap/dao/DocumentDAO.java
	BDT-ejb/ejbModule/minsal/divap/dao/ProgramasDAO.java
	BDT-ejb/ejbModule/minsal/divap/dao/ReliquidacionDAO.java
	BDT-ejb/ejbModule/minsal/divap/excel/GeneradorExcel.java
	BDT-ejb/ejbModule/minsal/divap/service/DocumentService.java
	BDT-ejb/ejbModule/minsal/divap/service/ProgramasService.java
	BDT-web/WebContent/WEB-INF/jboss-web.xml

problemas resueltos para reportes#