Merge branch 'master' into hotfix-add-button-to-delete-learning-object

.gitignore

Dockerfile

Gemfile

Gemfile.lock

README.md

app/controllers/collections_controller.rb

app/models/bookmark.rb

app/models/carousel.rb

app/models/collection.rb

app/models/collection_item.rb

app/models/complaint.rb

app/models/complaint_reason.rb

app/models/download.rb

app/models/follow.rb

app/models/institution.rb

app/models/language.rb

app/models/learning_object.rb

app/models/learning_object/attachment.rb

app/models/learning_object/draft.rb

app/models/like.rb