Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

.erdconfig

Gemfile

Gemfile.lock

app/builders/learning_object/draft_builder.rb

app/builders/learning_object_builder.rb

app/controllers/application_controller.rb

app/controllers/concerns/deleted_objects_controller.rb

app/controllers/concerns/followable_controller.rb

app/controllers/concerns/highlights_controller.rb

app/controllers/concerns/resource_model.rb

app/controllers/concerns/sociable_controller.rb

app/controllers/concerns/taggable_controller.rb

app/controllers/old/about_controller.rb

app/controllers/old/bookmarks_controller.rb

app/controllers/old/callbacks_controller.rb

app/controllers/old/chunks_controller.rb

app/controllers/old/collections_controller.rb

app/controllers/old/complaints_controller.rb

app/controllers/old/feedbacks_controller.rb

app/controllers/old/institutions_controller.rb