Conflicts: app/controllers/admin/stats_controller.rb app/views/admin/stats/index.html.haml
Conflicts: app/views/admin/stats/index.html.haml