# Conflicts:
#	app/controllers/admin/dashboard_controller.rb
#	app/views/admin/dashboard/index.html.haml

[ci skip]