Merge origin/master

Conflicts:
	administracion/administracion.js/proveedor.js