listo informacion del paquete
Merge branch 'master' of https://github.com/niuskamora/SHSDC

Conflicts:
	dompdf/lib/fonts/log.htm

	modified:   ajax/areas.php
	modified:   ajax/breakdown_valise.php
	modified:   ajax/confirm_externo.php
	modified:   ajax/confirmed.php
	modified:   ajax/external_costs.php
	modified:   ajax/info_assign_headquarters_area.php
	modified:   ajax/user_headquarters_mail.php
	modified:   ajax/user_mailbox.php
	modified:   ajax/view_package.php
	deleted:    cache/wsdlcache-41699cc6ad39aa0c4a847a32e7c88e16
	deleted:    cache/wsdlcache-41699cc6ad39aa0c4a847a32e7c88e16.lock
	modified:   cache/wsdlcache-aeb8907dcd50bd904dd4f257171e5460
	deleted:    cache/wsdlcache-cbd7d1c7c921acfc6b10457edf779862
	deleted:    cache/wsdlcache-cbd7d1c7c921acfc6b10457edf779862.lock
	deleted:    cache/wsdlcache-fca1b1d700c3257eb5a577c91b7ad68d
	deleted:    cache/wsdlcache-fca1b1d700c3257eb5a577c91b7ad68d.lock
	modified:   config/wsdl.php
	modified:   dompdf/lib/fonts/log.htm
	new file:   images/adjunto/ENDnw.png
	new file:   images/adjunto/GKEFz.png
	new file:   images/adjunto/QbGZH.png
	new file:   images/adjunto/sZXDm.png
	new file:   images/codigoBarras/02122014282.png
	new file:   images/codigoBarras/02122014283.png
	new file:   images/codigoBarras/0212281.png
	modified:   pages/assign_headquarters.php
	modified:   pages/confirm_package.php
	modified:   pages/confirmed_user.php
	modified:   pages/create_area.php
	modified:   pages/create_headquarters.php
	modified:   pages/create_user.php
	modified:   pages/create_valise.php
	modified:   pages/disable_area.php
	modified:   pages/edit_type_user.php
	modified:   pages/edit_user.php
	modified:   pages/external_costs.php
	modified:   pages/index.php
	modified:   pages/misguidance_report.php
	modified:   pages/prueba.php
	modified:   pages/response_package.php
	modified:   pages/send_correspondence.php
	modified:   pages/suitcase_overdue.php
	modified:   pages/user_role.php
	modified:   views/confirm_externo.php
	modified:   views/confirm_package.php
	modified:   views/confirmed_user.php
	modified:   views/correspondence_lost.php
	modified:   views/correspondence_overdue.php
	modified:   views/create_user.php
	modified:   views/edit_user.php
	modified:   views/external_costs.php
	modified:   views/response_package.php
	modified:   views/send_correspondence.php
	modified:   views/suitcase_overdue.php
	modified:   views/tracing_overdue.php
	modified:   views/user_role.php
	modified:   views/view_user.php