modified:   SalesSoft_v2/Images/logo.jpg
	modified:   SalesSoft_v2/Login.xaml
	modified:   SalesSoft_v2/ucModificarFactura.xaml
Merge branch 'master' of https://github.com/cesardarinel/SalesSoft_v2

Conflicts:
	SalesSoft_v2/Login.xaml
	SalesSoft_v2/ucModificarFactura.xaml

	modified:   SalesSoft_v2/Login.xaml
	modified:   SalesSoft_v2/Login.xaml.cs
	modified:   SalesSoft_v2/Recursos/Entidades.cs
	modified:   SalesSoft_v2/SalesSoft_v2.csproj
	modified:   SalesSoft_v2/ucCuentasPorCobrar.xaml
	modified:   SalesSoft_v2/ucCuentasPorCobrar.xaml.cs
	modified:   SalesSoft_v2/ucModificarFactura.xaml