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

Conflicts:
	views/create_area.php
	views/create_headquarters.php

	modified:   ajax/breakdown_valise.php
	modified:   ajax/view_package.php
	new file:   images/codigoBarras/021220131.png
	deleted:    images/codigoBarras/02122014101.png
	deleted:    images/codigoBarras/02122014103.png
	deleted:    images/codigoBarras/02122014104.png
	deleted:    images/codigoBarras/02122014105.png
	deleted:    images/codigoBarras/02122014106.png
	deleted:    images/codigoBarras/02122014107.png
	deleted:    images/codigoBarras/02122014108.png
	deleted:    images/codigoBarras/02122014121.png
	deleted:    images/codigoBarras/02122014142.png
	deleted:    images/codigoBarras/0212201481.png
	deleted:    images/codigoBarras/0212201482.png
	deleted:    images/codigoBarras/0212201483.png
	deleted:    images/codigoBarras/0212201484.png
	deleted:    images/codigoBarras/0212201485.png
	deleted:    images/codigoBarras/02222014102.png
	new file:   images/codigoBarras/0276201381.png
	deleted:    images/codigoBarras/027620141.png
	deleted:    images/codigoBarras/0276201481.png
	deleted:    images/codigoBarras/02942014101.png
	modified:   index.php
	modified:   pages/bag_and_pack.php
	modified:   pages/create_area.php
	modified:   pages/create_external_mailbox.php
	modified:   pages/create_headquarters.php
	modified:   pages/create_provider.php
	modified:   pages/create_user.php
	modified:   pages/graphics_reports_package.php
	modified:   pages/info_reports_package.php
	modified:   pages/info_reports_valise.php
	modified:   pages/print_packages_confirmed.php
	modified:   pages/proof_of_bags_report.php
	modified:   pages/proof_of_correspondence.php
	modified:   pages/proof_of_correspondence_package.php
	modified:   pages/proof_of_traking_package.php
	modified:   pages/proof_package_confirmed.php
	modified:   pages/proof_pouch.php
	modified:   pages/proof_pouch_and_packages.php
	modified:   pages/proof_reporting_package.php
	modified:   pages/send_correspondence.php
	modified:   pdf/proof_reporting_package.php
	modified:   recursos/funciones.php
	modified:   template/proof_reporting_package.php
	modified:   views/Shipping_external_mailbox.php
	modified:   views/administration.php
	modified:   views/breakdown_valise.php
	modified:   views/confirm_package.php
	modified:   views/create_area.php
	modified:   views/create_document.php
	modified:   views/create_external_mailbox.php
	modified:   views/create_headquarters.php
	modified:   views/create_provider.php
	modified:   views/create_user.php
	modified:   views/edit_mailbox.php
	modified:   views/enviados.php
	modified:   views/enviadosPendientes.php
	modified:   views/headquarters.php
	modified:   views/inbox.php
	modified:   views/index.php
	modified:   views/indexSh.php
	modified:   views/info_reports_package.php
	modified:   views/mailboxs.php
	modified:   views/packege_area.php
	modified:   views/recibidosPendientes.php
	modified:   views/response_package.php
	modified:   views/send_correspondence.php