Merge branch 'master' into file_upload

app/assets/javascripts/application/collections.coffee

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/subject.rb

app/repositories/active_record/carousel_repository.rb

app/repositories/orient_db/attribute_repository.rb

app/repositories/orient_db/base.rb

app/repositories/orient_db/collection_repository.rb

app/repositories/orient_db/complaint_repository.rb

app/repositories/orient_db/institution_repository.rb

app/repositories/orient_db/learning_object/relation.rb

...repositories/orient_db/learning_object/relations_chain.rb

app/repositories/orient_db/learning_object_repository.rb