sucursal
cagazooooo
Merge remote-tracking branch 'origin/1.0' into 1.0

Conflicts:

	VelosCar/VelosCar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache