Merge branch 'master' into fixing-statistics

app/assets/images/icons/Curtir_02.png

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/welcome.scss

app/assets/stylesheets/management.scss

app/builders/collection_builder.rb

app/controllers/collections_controller.rb

app/controllers/complaints_controller.rb

app/controllers/institutions_controller.rb

app/controllers/learning_objects_controller.rb

app/controllers/management/complaints_controller.rb

app/controllers/management/institutions_controller.rb

app/controllers/users_controller.rb