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

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

app/views/admin/conference/_sidebar.html.haml

@@ -47,4 +47,7 @@
       %li.active= link_to "Dietary Choices", "#"
     - else
       %li= link_to "Dietary Choices", admin_conference_dietary_list_path(@conference.short_title)
-
+    - if activated == "Questions"
+      %li.active= link_to "Questions", "#"
+    - else
+      %li= link_to "Questions", admin_conference_questions_path(@conference.short_title)