Merge branch 'master' into sign-up-panel

app/assets/images/logo.png

app/assets/images/user-anon.png

app/assets/javascripts/application.js

app/assets/javascripts/application/accessibility.js

app/assets/javascripts/application/collections.coffee

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/search.scss

app/assets/stylesheets/application/users.scss

app/assets/stylesheets/edges.scss

app/assets/stylesheets/learning_objects.scss

app/assets/stylesheets/registrations.scss

app/assets/stylesheets/university.scss

app/assets/stylesheets/users.scss

app/controllers/collections_controller.rb

app/controllers/learning_objects_controller.rb

app/controllers/management/welcome_controller.rb

app/controllers/management_controller.rb

app/controllers/search/solr_controller.rb

app/controllers/search_controller.rb