18_04_14
Merge branch 'master' of https://github.com/naorbo/BikeChallange

Conflicts:
	BikeChallengeApp/obj/Debug/BikeChallengeApp.csproj.FileListAbsolute.txt
	_NewInfra/BikeChallengeApp/obj/Debug/BikeChallengeApp.csprojResolveAssemblyReference.cache
	_NewInfra/BikeChallengeApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache