arreglo compras- producto
Merge branch 'master' of https://github.com/alonsonic/Desarrollo

Conflicts:
	AeiWebServices/AeiWebServices/Logica/ServicioAEI.svc.cs
	AeiWebServices/AeiWebServices/Permanencia/FabricaDAO.cs