01062014-1, Update Profile, New Captain Controller

Update Profile - PUT method from the Rider Controller
Captain Controller - switch captain method
Merge branch 'master' of https://github.com/naorbo/BikeChallange

Conflicts:
	BikeChallengeApp/index.html