Merge branch 'master' into add-thumbnail-to-archives

Gemfile.lock

app/assets/javascripts/application.js

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

app/assets/javascripts/application/search.js

app/assets/javascripts/management.js

app/assets/javascripts/management/accesses.js

app/assets/javascripts/management/downloads.js

app/assets/javascripts/management/learning_objects.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/jquery-ui.css

app/assets/stylesheets/application/jquery-ui.structure.css

app/assets/stylesheets/application/jquery-ui.theme.css

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/search.scss

app/assets/stylesheets/application/welcome.scss

app/builders/learning_object_builder.rb

app/controllers/complaints_controller.rb

app/controllers/management/statistics_controller.rb

app/controllers/management_controller.rb

app/controllers/search_controller.rb