Merge remote-tracking branch 'origin/master' into gs-master

Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml

config/application.rb

@@ -42,8 +42,10 @@ module Mastodon
       :bg,
       :ca,
       :de,
+      :el,
       :eo,
       :es,
+      :eu,
       :fa,
       :fi,
       :fr,
@@ -68,6 +70,7 @@ module Mastodon
       :sr,
       :'sr-Latn',
       :sv,
+      :te,
       :th,
       :tr,
       :uk,