conflicto dos
avance de busqueda por equivalencias
Merge branch 'development' of https://github.com/aliciacatalina/multiproveedores into development