Client Side - User Registration (Org/Team Handling)
Runtime Conflicts
Merge branch 'master' of https://github.com/naorbo/BikeChallange

Conflicts:
	BikeChallengeApp/bin/BikeChallengeApp.dll
	BikeChallengeApp/bin/BikeChallengeApp.pdb
	BikeChallengeApp/obj/Debug/BikeChallengeApp.dll
	BikeChallengeApp/obj/Debug/BikeChallengeApp.pdb