fix merge conflicts

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/javascripts/application/notice.coffee

app/assets/stylesheets/application/learning_objects.scss

app/builders/builder.rb

app/builders/complaint_builder.rb

app/builders/learning_object_builder.rb

app/controllers/collections_controller.rb

app/controllers/complaints_controller.rb

app/controllers/management/complaints_controller.rb

app/controllers/management/users_controller.rb

app/models/attribute.rb

app/models/bookmarks.rb

app/models/collection.rb

app/models/complaint.rb

app/models/concerns/orient_db_serializable.rb

app/models/learning_object.rb