Merge branch 'master' into french-translation

.env.production.sample

Gemfile

Gemfile.lock

app/assets/javascripts/components/components/lightbox.jsx

app/assets/javascripts/components/locales/en.jsx

app/assets/javascripts/components/middleware/errors.jsx

app/controllers/api/v1/accounts_controller.rb

app/controllers/api/v1/notifications_controller.rb

app/controllers/api/v1/statuses_controller.rb

app/controllers/api/v1/timelines_controller.rb

app/controllers/api_controller.rb

app/controllers/application_controller.rb

app/models/feed.rb

app/models/notification.rb

app/models/status.rb

app/models/user.rb

app/services/notify_service.rb

app/services/process_feed_service.rb

app/services/search_service.rb

app/workers/salmon_worker.rb