07062014-2, update rider captain handaling
Merge branch 'master' of https://github.com/naorbo/BikeChallange

Conflicts:
	BikeChallengeApp/LogFiles/UsersLog.txt