Merged with master and fixed conflicts

Gemfile.lock

app/assets/javascripts/management.js

app/assets/javascripts/management/users.js

app/builders/attribute_builder.rb

app/builders/builder.rb

app/builders/collection_builder.rb

app/builders/complaint_builder.rb

app/builders/institution_builder.rb

app/builders/learning_object_builder.rb

app/builders/subject_builder.rb

app/controllers/complaints_controller.rb

app/controllers/learning_objects_controller.rb

app/controllers/management/statistics_controller.rb

app/controllers/management/users_controller.rb

app/repositories/orient_db/learning_object_repository.rb

app/views/learning_objects/_form.html.erb

app/views/learning_objects/show.html.erb

app/views/management/complaints/index.html.erb

app/views/management/statistics/accesses.html.erb

app/views/management/statistics/collections.html.erb