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

Gemfile

Gemfile.lock

app/builders/learning_object_builder.rb

app/controllers/v1/collections_controller.rb

app/controllers/v1/learning_objects_controller.rb

app/models/collection.rb

app/models/collection_item.rb

app/serializers/collection_serializer.rb

app/serializers/learning_object_serializer.rb

app/services/learning_object_publisher.rb

app/services/search_service/collection.rb

app/services/search_service/learning_object.rb

app/services/search_service/model.rb

app/services/search_service/user.rb

config/initializers/elasticsearch.rb

config/routes.rb

db/migrate/20170511161146_add_curator_to_learning_object.rb

...grate/20170512092359_add_magnetlink_to_learning_object.rb

...rate/20170516111857_add_deleted_at_to_collection_items.rb

db/migrate/20170518120936_add_curator_to_collection.rb