Conflicts: app/views/repositories/show.html.erb db/migrate/20160624103411_add_name_to_quality_analyses.rb db/schema.rb