Finish update-without-password feature
Add update-without-password test
Refactory code
Merge remote-tracking branch 'refs/remotes/origin/update-without-password'

Conflicts:
	app/controllers/application_controller.rb
	spec/acceptance/steps/steps.rb
	spec/acceptance/steps/user_steps.rb