Listo resuelto errores...
commit
Merge branch 'master' of https://github.com/alonsonic/Desarrollo

Conflicts:
	AeiCliente/AeiCliente/GUI/DireccionPopup.xaml.cs
	AeiCliente/AeiCliente/Service References/ServicioDireccion/Reference.cs
quitando un errorr