Merge origin/master

Conflicts:
	administracion/administracion.js/gestionAdministrativaClientes.js
	administracion/gestionAdministrativaClientes.php