fixes conflicts with master [#500]

app/controllers/admin/stats_controller.rb

@@ -2,6 +2,22 @@ class Admin::StatsController < Admin::BaseController
 
   def show
     @event_types = Ahoy::Event.group(:name).count
+
+    @visits = Visit.count
+    @debates = Debate.with_hidden.count
+    @proposals = Proposal.with_hidden.count
+    @comments = Comment.with_hidden.count
+
+    @debate_votes = Vote.where(votable_type: 'Debate').count
+    @proposal_votes = Vote.where(votable_type: 'Proposal').count
+    @comment_votes = Vote.where(votable_type: 'Comment').count
+    @votes = Vote.count
+
+    @user_level_two = User.with_hidden.level_two_verified.count
+    @user_level_three = User.with_hidden.level_three_verified.count
+    @verified_users = User.with_hidden.level_two_or_three_verified.count
+    @unverified_users = User.with_hidden.unverified.count
+    @users = User.with_hidden.count
   end
 
 end