wsdl
	modified:   dompdf/lib/fonts/log.htm
Merge branch 'master' of https://github.com/jose1988/SDCSH

Conflicts:
	dompdf/lib/fonts/log.htm

	modified:   ajax/edit_assign_headquarters.php
	modified:   ajax/info_assign_headquarters.php
	modified:   dompdf/lib/fonts/log.htm
	new file:   images/codigoBarras/021220143.png
	new file:   images/codigoBarras/0212201482.png
	new file:   images/codigoBarras/0212201484.png
	new file:   images/codigoBarras/0276201481.png
	new file:   images/codigoBarras/0276201482.png
	new file:   images/codigoBarras/0276201483.png
	new file:   images/codigoBarras/0276201484.png
	new file:   images/codigoBarras/0276201485.png
	new file:   pages/proof_pouch_report.php
	modified:   pages/valise_report.php
	modified:   views/valise_report.php
Merge branch 'master' of https://github.com/jose1988/SDCSH