Merge branch 'master' into show-all-activities

app/controllers/concerns/publisher_controller.rb

app/controllers/v1/users_controller.rb

app/models/concerns/publisher.rb

app/models/institution.rb

app/models/user.rb

app/policies/publisher_policy.rb

app/policies/user_policy.rb

app/serializers/learning_object_serializer.rb

app/services/score_calculator_service.rb

config/environments/test.rb

config/feature.yml

config/routes.rb

spec/acceptance/learning_objects_spec.rb

spec/factories/learning_objects.rb

spec/factories/taggings.rb

spec/factories/tags.rb

spec/factories/users.rb