Merge branch 'master' into master

config/locales/fi.yml

config/puma.rb

config/routes.rb

...0170406215816_add_notifications_and_favourites_indices.rb

db/schema.rb

docs/Running-Mastodon/Administration-guide.md

docs/Running-Mastodon/Heroku-guide.md

docs/Running-Mastodon/Production-guide.md

docs/Running-Mastodon/Scalingo-guide.md

docs/Running-Mastodon/Vagrant-guide.md

docs/Using-Mastodon/Apps.md

docs/Using-Mastodon/FAQ.md

docs/Using-Mastodon/List-of-Mastodon-instances.md

docs/Using-Mastodon/User-guide.md

scalingo.json

spec/fabricators/media_attachment_fabricator.rb

spec/fabricators/status_fabricator.rb

spec/models/account_spec.rb

spec/models/status_spec.rb

spec/services/post_status_service_spec.rb