Merge branch 'master' into log-in-contrast

app/assets/javascripts/application.js

app/assets/javascripts/application/accessibility.js

app/assets/javascripts/application/collections.coffee

app/assets/stylesheets/application.scss

app/controllers/users_controller.rb

app/helpers/learning_objects_helper.rb

app/models/learning_object.rb

app/models/search.rb

app/views/collections/_collection.html.erb

app/views/collections/_create.html.erb

app/views/collections/_form.html.erb

app/views/collections/index.html.erb

app/views/learning_objects/_learning_object.erb

app/views/shared/application/_header.html.erb

app/views/users/show.html.erb

config/routes.rb