merges master and fixes conflicts

app/controllers/moderation/comments_controller.rb

@@ -0,0 +1,8 @@
+class Moderation::CommentsController < Moderation::BaseController
+
+  def hide
+    @comment = Comment.find(params[:id])
+    @comment.hide
+  end
+
+end

app/controllers/moderation/dashboard_controller.rb

@@ -1,5 +1,4 @@
 class Moderation::DashboardController < Moderation::BaseController
-  layout 'admin'
 
   def index
   end

app/controllers/moderation/debates_controller.rb

@@ -0,0 +1,7 @@
+class Moderation::DebatesController < Moderation::BaseController
+
+  def hide
+    @debate = Debate.find(params[:id])
+    @debate.hide
+  end
+end