07062014-1

Just a sync
Merge branch 'master' of https://github.com/naorbo/BikeChallange

Conflicts:
	BikeChallengeApp/LogFiles/UsersLog.txt
	BikeChallengeApp/obj/Debug/BikeChallengeApp.csproj.FileListAbsolute.txt

	BikeChallengeApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache