Merge branch 'master' into openstreetbugs

Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb

app/models/user.rb

@@ -200,6 +200,7 @@ class User < ActiveRecord::Base
     self.image = nil
     self.email_valid = false
     self.new_email = nil
+    self.openid_url = nil
     self.status = "deleted"
     self.save
   end