Merge branch 'master' into tag-frequency-task

Gemfile.lock

app/builders/learning_object_builder.rb

app/controllers/concerns/followable_controller.rb

app/controllers/v1/collections_controller.rb

app/controllers/v1/feed_controller.rb

app/controllers/v1/institutions_controller.rb

app/controllers/v1/learning_objects_controller.rb

app/controllers/v1/licenses_controller.rb

app/controllers/v1/mime_types_controller.rb

app/controllers/v1/object_types_controller.rb

app/controllers/v1/ratings_controller.rb

app/controllers/v1/roles_controller.rb

app/controllers/v1/users_controller.rb

app/models/collection.rb

app/models/collection_item.rb

app/models/concerns/trackable.rb

app/models/institution.rb

app/models/learning_object.rb

app/models/role.rb

app/models/search.rb