Cargando app movil
app movil
Merge branch 'master' of https://github.com/alonsonic/Desarrollo

Conflicts:
	AeiCliente/AeiCliente/Service References/ServicioAEI/Reference.cs
	AeiCliente/AeiCliente/Service References/ServicioAEI/Reference.svcmap
	AeiCliente/AeiCliente/Service References/ServicioAEI/ServicioAEI1.wsdl
	AeiCliente/AeiCliente/Service References/ServicioAEI/ServicioAEI41.xsd
	AeiCliente/AeiCliente/Service References/ServicioAEI/ServicioAEI42.xsd
	AeiWebServices/AeiWebServices/Conexion/ConexionSqlServer.cs