Merge branch 'master' into 'collection_patch_test'

Gemfile

Gemfile.lock

app/controllers/concerns/taggable_controller.rb

app/controllers/v1/collections_controller.rb

app/controllers/v1/learning_objects_controller.rb

app/models/collection.rb

app/models/concerns/metadatable.rb

app/models/learning_object.rb

app/models/review.rb

app/models/user.rb

app/policies/collection_policy.rb

app/serializers/learning_object_serializer.rb

app/services/score_calculator_service.rb

app/services/search_service.rb

app/services/search_service/learning_object.rb

app/services/search_service/model.rb

app/services/search_service/user.rb

calculate_score.groovy

config/application.rb

config/database.yml