rspec-rails added
layout file changed to haml
conflicts resolved develop -> activeadmin