ulltimo
Merge remote-tracking branch 'origin/master'

Conflicts:
	modelo/DAO/ProveedorDAO.php
	vista/EditarCliente.php