Merge origin/master

Conflicts:
	administracion/generarReporte.php
	administracion/reportes/probando.pdf
	dompdf/lib/fonts/log.htm
Merge origin/master

Conflicts:
	administracion/generarReporte.php
	administracion/reportes/probando.pdf
	dompdf/lib/fonts/log.htm
Merge origin/master

Conflicts:
	administracion/generarReporte.php
	administracion/reportes/probando.pdf
	dompdf/lib/fonts/log.htm