removed deprecated call to admin::dashboard
merge conflict in gemfile
merge Gemfile, clean out calls to pry
added capybara-screenshot
updated en.yml to keep activeadmin happy
revert to legacy specs for admin
Merge pull request #51 from adelevie/feature/activeadmin_dashboard_warning

Feature/activeadmin dashboard warning