Merge branch 'master' into patch-1

.dockerignore

.env.production.sample

Dockerfile

Gemfile

Gemfile.lock

Procfile

README.md

Vagrantfile

app/assets/images/background-photo.jpeg

app/controllers/accounts_controller.rb

app/controllers/application_controller.rb

app/controllers/concerns/localized.rb

app/controllers/oauth/authorizations_controller.rb

app/controllers/oauth/authorized_applications_controller.rb

app/controllers/stream_entries_controller.rb

app/helpers/stream_entries_helper.rb

app/lib/atom_serializer.rb

app/lib/tag_manager.rb

app/models/account.rb

app/models/status.rb