Merge branch 'master' into generate-thumbnails

app/models/web_link.rb

app/repositories/active_record/carousel_repository.rb

app/repositories/active_record/learning_object_repository.rb

app/repositories/active_record/main_page_repository.rb

app/repositories/active_record/subject_repository.rb

app/repositories/active_record/weblink_repository.rb

app/repositories/orient_db/attribute_repository.rb

app/repositories/orient_db/base.rb

app/repositories/orient_db/carousel_repository.rb

app/repositories/orient_db/collection_repository.rb

app/repositories/orient_db/highlight_repository.rb

app/repositories/orient_db/institution_repository.rb

app/repositories/orient_db/learning_object_repository.rb

app/repositories/orient_db/main_page_repository.rb

app/repositories/orient_db/subject_repository.rb

app/repositories/orient_db/user_repository.rb

app/repositories/orient_db/weblink_repository.rb

app/repositories/repositories_proxy.rb

app/repositories/user_repository_proxy.rb

app/views/collections/_collection.html.erb