jose luis cambios
Update
Merge branch 'refs/heads/JOSE-LUIS'

Conflicts:
	CocheAmigos2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	DataAccess/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache