Merge branch 'master' into tag-frequency-task

app/controllers/concerns/submission_controller.rb

app/controllers/v1/learning_objects/publishes_controller.rb

app/controllers/v1/learning_objects_controller.rb

app/controllers/v1/users_controller.rb

app/models/concerns/stateful.rb

app/models/role.rb

app/models/user.rb

app/policies/activity_policy.rb

app/policies/application_policy.rb

app/policies/bookmark_policy.rb

app/policies/collection_policy.rb

app/policies/institution_policy.rb

app/policies/language_policy.rb

app/policies/learning_object_policy.rb

app/policies/license_policy.rb

app/policies/mime_type_policy.rb

app/policies/object_type_policy.rb

app/policies/publisher_policy.rb

app/policies/rating_policy.rb

app/policies/search_policy.rb