Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css

db/migrate/052_add_contributor_terms_to_user.rb

@@ -0,0 +1,11 @@
+class AddContributorTermsToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :terms_agreed, :datetime
+    add_column :users, :consider_pd, :boolean, :null => false, :default => false
+  end
+
+  def self.down
+    remove_column :users, :consider_pd
+    remove_column :users, :terms_agreed
+  end
+end