Merge branch 'master' into fixing-statistics

Gemfile.lock

app/assets/javascripts/application.js

app/assets/javascripts/application/collections.coffee

app/assets/javascripts/application/columns.js

...ssets/javascripts/application/learning_objects.coffee.erb

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/collections.scss

app/assets/stylesheets/application/learning_objects.scss

app/builders/attribute_builder.rb

app/builders/builder.rb

app/builders/collection_builder.rb

app/builders/institution_builder.rb

app/builders/learning_object_builder.rb

app/builders/subject_builder.rb

app/controllers/collections_controller.rb

app/models/concerns/orient_db_serializable.rb

app/models/learning_object.rb

app/models/learning_object/attachment.rb

app/models/subject.rb

app/repositories/active_record/carousel_repository.rb