correccion de reportes
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-app/reports/estudio-socioeconomico.rptdesign