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

app/builders/learning_object/draft_builder.rb

app/controllers/concerns/highlights_controller.rb

app/controllers/concerns/sociable_controller.rb

app/controllers/v1/activities_controller.rb

app/controllers/v1/collections_controller.rb

app/controllers/v1/learning_objects_controller.rb

app/controllers/v1/reviews_controller.rb

app/controllers/v1/users_controller.rb

app/models/collection.rb

app/models/concerns/highlights.rb

app/models/concerns/stateful.rb

app/models/learning_object.rb

app/models/user.rb

app/policies/activity_policy.rb

app/policies/collection_policy.rb

app/services/learning_object_publisher.rb

app/workers/dspace_upload_worker.rb

config/feature.yml

config/routes.rb

...e/20160519122525_change_state_type_in_learning_objects.rb