CAMBIOS
Merge branch 'master' of https://github.com/jose1988/SDCSH

Conflicts:
	dompdf/lib/fonts/log.htm

	modified:   dompdf/lib/fonts/log.htm
	new file:   images/codigoBarras/021220141.png
	modified:   pages/create_user.php
	modified:   pages/edit_user.php
	new file:   pages/external_costs.php
	modified:   pages/proof_of_correspondence.php
	modified:   pages/proof_of_correspondence_package.php
	modified:   pages/proof_pouch.php
	modified:   pages/view_user.php
	modified:   pdf/proof_of_correspondence.php
	modified:   pdf/proof_of_correspondence_package.php
	modified:   pdf/proof_pouch.php
	modified:   recursos/funciones.php
	modified:   template/proof_of_correspondence.php
	modified:   template/proof_of_correspondence_package.php
	modified:   template/proof_package_confirmed.php
	modified:   template/proof_pouch.php
	modified:   views/confirm_package.php
	modified:   views/correspondence_overdue.php
	modified:   views/create_user.php
	modified:   views/edit_user.php
	new file:   views/external_costs.php
	modified:   views/print_packages_confirmed.php
	modified:   ajax/bandejas.php
	modified:   pages/inbox.php
	modified:   views/create_external_mailbox.php
	pages/create_external_mailbox.php
	pages/misguidance_report.php
	views/misguidance_report.php