Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions

Conflicts:
	app/models/conference.rb
	config/routes.rb

db/migrate/20140109190643_create_questions.rb

@@ -0,0 +1,12 @@
+class CreateQuestions < ActiveRecord::Migration
+  def change
+    create_table :questions do |t|
+      t.string :title
+      t.references :question_type
+      t.integer :conference_id
+      t.boolean :global
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20140109190844_create_question_types.rb

@@ -0,0 +1,9 @@
+class CreateQuestionTypes < ActiveRecord::Migration
+  def change
+    create_table :question_types do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20140109191042_create_answers.rb

@@ -0,0 +1,9 @@
+class CreateAnswers < ActiveRecord::Migration
+  def change
+    create_table :answers do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20140109191145_create_qanswers.rb

@@ -0,0 +1,8 @@
+class CreateQanswers < ActiveRecord::Migration
+  def change
+    create_table :qanswers do |t|
+      t.references :question
+      t.references :answer
+    end
+  end
+end

db/migrate/20140109191321_create_conferences_questions.rb

@@ -0,0 +1,8 @@
+class CreateConferencesQuestions < ActiveRecord::Migration
+  def change
+    create_table :conferences_questions, :id => false do |t|
+      t.references :conference
+      t.references :question
+    end
+  end
+end

db/migrate/20140112192801_create_qanswers_registrations.rb

@@ -0,0 +1,8 @@
+class CreateQanswersRegistrations < ActiveRecord::Migration
+  def change
+    create_table :qanswers_registrations, :id => false do |t|
+      t.references :registration, :null => false
+      t.references :qanswer, :null => false
+    end
+  end
+end