Adds color attribute to conference

app/models/conference.rb

@@ -9,7 +9,7 @@ class Conference < ActiveRecord::Base
 		              :questions_attributes, :question_ids, :answers_attributes, :answer_ids,
                   :difficulty_levels_attributes, :use_difficulty_levels,
                   :use_vpositions, :use_vdays, :vdays_attributes, :vpositions_attributes, :use_volunteers,
-                  :media_id, :media_type
+                  :media_id, :media_type, :color
 
   has_paper_trail
 
@@ -122,7 +122,7 @@ class Conference < ActiveRecord::Base
 
     return false
   end
-  
+
   private
 
   ##