fixes to facebook login
fixes to facebook login
UPDATES
Merge branch 'master' of https://github.com/centralvalero/ratedate-ruby

Conflicts:
	app/controllers/application_controller.rb
	app/models/user.rb
	config/initializers/omniauth.rb