fix oauth
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/users_controller.rb

	modified:   app/controllers/users_controller.rb
fix oauth