Merge remote-tracking branch 'tootsuite/master'

diff --cc app/views/settings/profiles/show.html.haml
Simple merge

diff --cc config/locales/en.yml
index 70712d34b5379df9a2f8b7849040634a95636768,2b7e9f2e28aab9588cf2abdb7f15d346ce042fa9..e0ae9eef9183e0e7cc8e7b60b1f67e1f3c28d1d5
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -576,7 -574,7 +582,8 @@@ en
      export: Data export
      followers: Authorized followers
      import: Import
 +    keyword_mutes: Muted keywords
+     migrate: Account migration
      notifications: Notifications
      preferences: Preferences
      settings: Settings

diff --cc config/navigation.rb
index 68ef3170667538bdc4ff5b92ab4511b4bee6c153,9c7a7d2ec61c27dc0e67b4a764228d3a658cb5ef..3f4c00dfa9d184cec029cebc93be63d316503057
--- 1/config/navigation.rb
--- 2/config/navigation.rb
+++ b/config/navigation.rb
@@@ -5,9 -5,8 +5,9 @@@ SimpleNavigation::Configuration.run do 
      primary.item :web, safe_join([fa_icon('chevron-left fw'), t('settings.back')]), root_url
  
      primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings|
-       settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url
+       settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration}
        settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
 +      settings.item :keyword_mutes, safe_join([fa_icon('volume-off fw'), t('settings.keyword_mutes')]), settings_keyword_mutes_url
        settings.item :notifications, safe_join([fa_icon('bell fw'), t('settings.notifications')]), settings_notifications_url
        settings.item :password, safe_join([fa_icon('lock fw'), t('auth.change_password')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
        settings.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}

diff --cc config/routes.rb
Simple merge