fix merge

Gemfile

Gemfile.lock

app/assets/images/icons/Curtir_02.png

app/assets/javascripts/application/accessibility.js

app/assets/javascripts/application/collections.coffee

app/assets/javascripts/application/complaints.coffee

...ssets/javascripts/application/learning_objects.coffee.erb

app/assets/javascripts/application/navigation-content.js

app/assets/javascripts/application/search.js

app/assets/javascripts/management.js

app/assets/javascripts/management/institutions.coffee

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/collections.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/welcome.scss

app/assets/stylesheets/management.scss

app/builders/collection_builder.rb

app/builders/institution_builder.rb

app/builders/learning_object_builder.rb

app/controllers/collections_controller.rb