Fix merge conflits

app/assets/javascripts/learning_object/chunks.coffee

app/builders/builder.rb

app/builders/learning_object/attachment_builder.rb

app/builders/learning_object_builder.rb

app/controllers/learning_object/chunks_controller.rb

app/controllers/management/statistics_controller.rb

app/models/concerns/orient_db_serializable.rb

app/models/learning_object.rb

app/models/learning_object/attachment.rb

app/models/main_page.rb

...sitories/orient_db/associations/attributes_association.rb

...es/orient_db/associations/learning_object_associations.rb

...ositories/orient_db/associations/publisher_association.rb

...positories/orient_db/associations/subject_associations.rb

...positories/orient_db/associations/subjects_association.rb

...ositories/orient_db/associations/subtopics_association.rb

...itories/orient_db/associations/supertopics_association.rb

app/repositories/orient_db/base.rb

app/repositories/orient_db/collection_repository.rb

app/repositories/orient_db/learning_object/relation.rb