listo compraaa =)
Merge branch 'master' of https://github.com/alonsonic/Desarrollo

Conflicts:
	AeiCliente/AeiCliente/GUI/ListaCompraPage.xaml.cs
	AeiCliente/AeiCliente/Service References/ServicioAEI/Reference.cs
	AeiCliente/AeiCliente/Service References/ServicioAEI/ServicioAEI.xsd