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

Conflicts:
	dompdf/lib/fonts/log.htm
	pages/package_area.php

	modified:   ajax/user_mailbox.php
	modified:   dompdf/lib/fonts/log.htm
	modified:   graphics/reports_package_horizontally.php
	modified:   graphics/reports_package_vertical.php
	modified:   graphics/reports_valise_horizontally.php
	modified:   graphics/reports_valise_vertical.php
	new file:   images/codigoBarras/02122014181.png
	new file:   images/codigoBarras/02122014182.png
	new file:   images/codigoBarras/02122014183.png
	new file:   images/codigoBarras/0212201483.png
	modified:   index.php
	modified:   pages/Shipping_external_mailbox.php
	modified:   pages/adminCorrespondencia.php
	modified:   pages/adminUsuario.php
	modified:   pages/administration.php
	modified:   pages/assign_headquarters.php
	modified:   pages/bag_and_pack.php
	modified:   pages/breakdown_valise.php
	modified:   pages/cargar.php
	modified:   pages/confirm_externo.php
	modified:   pages/confirm_package.php
	modified:   pages/confirm_valise.php
	modified:   pages/confirmed_user.php
	modified:   pages/correspondence_overdue.php
	modified:   pages/crearDocumento.php
	modified:   pages/crearValija.php
	modified:   pages/create_area.php
	modified:   pages/create_external_mailbox.php
	modified:   pages/create_headquarters.php
	modified:   pages/create_mailbox.php
	modified:   pages/create_provider.php
	modified:   pages/create_user.php
	modified:   pages/create_valise.php
	modified:   pages/dhUsuario.php
	modified:   pages/disable_area.php
	modified:   pages/edit_mailbox.php
	modified:   pages/edit_type_user.php
	modified:   pages/edit_user.php
	modified:   pages/editarDocumento.php
	modified:   pages/entrada.php
	modified:   pages/external_costs.php
	modified:   pages/graphics_reports_package.php
	modified:   pages/headquarters.php
	modified:   pages/inbox.php
	modified:   pages/indexSh.php
	modified:   pages/info_reports_package.php
	modified:   pages/info_reports_valise.php
	modified:   pages/mailboxs.php
	modified:   pages/misguidance_report.php
	modified:   pages/package_area.php
	modified:   pages/package_detail_traking.php
	modified:   pages/print_packages_confirmed.php
	modified:   pages/proof_of_bags_report.php
	modified:   pages/proof_of_traking_package.php
	modified:   pages/proof_package_confirmed.php
	modified:   pages/proof_reporting_package.php
	modified:   pages/reports_package.php
	modified:   pages/reports_valise.php
	modified:   pages/response_package.php
	modified:   pages/send_correspondence.php
	modified:   pages/suitcase_overdue.php
	modified:   pages/tracing_overdue.php
	modified:   pages/user_role.php
	modified:   pages/vacuum_bitacora.php
	modified:   pages/valise_report.php
	modified:   pages/verCuenta.php
	modified:   pages/verUsuario.php
	modified:   pages/view_user.php
	modified:   template/proof_of_traking_package.php
	modified:   template/proof_package_confirmed.php
	modified:   views/create_user.php
	modified:   views/package_detail_traking.php
	modified:   views/see_package.php