todo funcionando
Merge branch 'master' of https://github.com/jose1988/SDC

Conflicts:
	index.php

	new file:   ajax/confirmed_area.php
	new file:   ajax/confirmed_headquarters.php
	new file:   ajax/view_package_area.php
	new file:   ajax/view_package_headquarters.php
	new file:   pages/confirm_valise.php
	deleted:    pages/crearUsuario.php
	new file:   pages/create_user.php
	new file:   pages/edit_user.php
	deleted:    pages/editarUsuario.php
	new file:   pages/headquarters_operator.php
	new file:   pages/operator_level.php
	new file:   pages/package_overdue_destination.php
	new file:   pages/package_overdue_origin.php
	new file:   pages/packages_report.php
	new file:   pages/print_operator_level.php
	new file:   pages/proof_of_correspondence.php
	new file:   pages/proof_operator_level.php
	new file:   pages/proof_pouch.php
	new file:   pages/reports_user.php
	new file:   pages/reports_valise.php
	new file:   pages/response_package.php
	new file:   pages/see_package.php
	new file:   pages/send_correspondence.php
	new file:   pages/suitcase_overdue_destination.php
	modified:   recursos/funciones.php
	modified:   views/confirm_valise.php
	modified:   views/create_user.php
	modified:   views/edit_user.php
	modified:   views/headquarters_operator.php
	new file:   views/java.php
	modified:   views/operator_level.php
	new file:   views/package_overdue_destination.php
	new file:   views/package_overdue_origin.php
	new file:   views/packages_report.php
	modified:   views/reports_user.php
	modified:   views/reports_valise.php
	new file:   views/response_package.php
	modified:   views/see_package.php