Merge from head -- breakage

diff --cc db/schema.rb
index 45d7b416a2eb0a25c752c23b3ddfe74920236c8f,cc61ca37c0b9abdbf9a6e19760d4749bd2ea6f66..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
--- 1/db/schema.rb
--- 2/db/schema.rb
+++ b/db/schema.rb
@@@ -1,73 -1,74 +1,0 @@@
--# This file is autogenerated. Instead of editing this file, please use the
--# migrations feature of ActiveRecord to incrementally modify your database, and
--# then regenerate this schema definition.
--
--ActiveRecord::Schema.define() do
--
--  create_table "candidates", :force => true do |t|
--    t.column "election_id",      :integer,                                :null => false
--    t.column "name",             :string,  :limit => 100, :default => "", :null => false
--    t.column "description",      :text
--    t.column "picture_filename", :string,  :limit => 200
--    t.column "picture_data",     :binary
--    t.column "picture_type",     :string,  :limit => 100
--  end
--
--  create_table "elections", :force => true do |t|
-     t.column "name",        :string,   :limit => 100, :default => "", :null => false
-     t.column "description", :text,                    :default => "", :null => false
-     t.column "anonymous",   :integer,  :limit => 4,   :default => 1,  :null => false
-     t.column "startdate",   :datetime
-     t.column "enddate",     :datetime,                                :null => false
-     t.column "active",      :integer,  :limit => 4,   :default => 0,  :null => false
-     t.column "user_id",     :integer
-     t.column "type",        :string,   :limit => 100, :default => "", :null => false
 -    t.column "name",            :string,   :limit => 100, :default => "",    :null => false
 -    t.column "description",     :text,                    :default => "",    :null => false
 -    t.column "anonymous",       :integer,  :limit => 4,   :default => 1,     :null => false
 -    t.column "startdate",       :datetime
 -    t.column "enddate",         :datetime,                                   :null => false
 -    t.column "active",          :integer,  :limit => 4,   :default => 0,     :null => false
 -    t.column "user_id",         :integer
 -    t.column "election_method", :string,   :limit => 100, :default => "ssd"
 -    t.column "type",            :string,   :limit => 100, :default => "",    :null => false
--  end
--
--  add_index "elections", ["user_id"], :name => "fk_user_election"
--
--  create_table "rankings", :force => true do |t|
--    t.column "vote_id",      :integer
--    t.column "candidate_id", :integer
--    t.column "rank",         :integer
--  end
--
--  create_table "tokens", :force => true do |t|
--    t.column "token",   :string,  :limit => 100, :default => "", :null => false
--    t.column "vote_id", :integer,                                :null => false
--  end
--
--  add_index "tokens", ["vote_id"], :name => "fk_vote_token"
--
--  create_table "users", :force => true do |t|
--    t.column "login",                     :text
--    t.column "ip",                        :text,                   :default => "", :null => false
--    t.column "email",                     :text
--    t.column "crypted_password",          :string,   :limit => 40
--    t.column "salt",                      :string,   :limit => 40
--    t.column "created_at",                :datetime
--    t.column "updated_at",                :datetime
--    t.column "remember_token",            :text
--    t.column "remember_token_expires_at", :datetime
--  end
--
--  create_table "voters", :force => true do |t|
--    t.column "email",       :string,  :limit => 100
--    t.column "password",    :string,  :limit => 100
--    t.column "contacted",   :integer, :limit => 4,   :default => 0, :null => false
--    t.column "election_id", :integer,                               :null => false
--    t.column "session_id",  :string,  :limit => 32
--    t.column "ipaddress",   :string,  :limit => 32
--  end
--
--  add_index "voters", ["election_id"], :name => "fk_election_voter"
--
--  create_table "votes", :force => true do |t|
--    t.column "voter_id",  :integer
--    t.column "confirmed", :integer,  :limit => 4, :default => 0, :null => false
--    t.column "time",      :datetime
--  end
--
--  add_index "votes", ["voter_id"], :name => "fk_vote_voter"
--
--end