Merge remote branch master

app/assets/images/icons/collection1.png

app/assets/images/icons/square.png

app/assets/javascripts/application/accessibility.js

app/assets/javascripts/application/search.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/search.scss

app/controllers/collections_controller.rb

app/controllers/welcome_controller.rb

app/models/learning_object.rb

app/views/search/index.html.erb

app/views/welcome/collection.html.erb

config/routes.rb

lib/tasks/dspace.rake