Merge remote-tracking branch 'upstream/master' into exit_on_back2

Conflicts:
	src/components/apphost.js

src/strings/en-us.json

@@ -408,6 +408,7 @@
     "HeaderMyDevice": "My Device",
     "HeaderMyMedia": "My Media",
     "HeaderMyMediaSmall": "My Media (small)",
+    "HeaderNavigation": "Navigation",
     "HeaderNewApiKey": "New API Key",
     "HeaderNewDevices": "New Devices",
     "HeaderNextEpisodePlayingInValue": "Next Episode Playing in {0}",
@@ -1104,7 +1105,6 @@
     "OptionEnableAccessFromAllDevices": "Enable access from all devices",
     "OptionEnableAccessToAllChannels": "Enable access to all channels",
     "OptionEnableAccessToAllLibraries": "Enable access to all libraries",
-    "OptionEnableAutomaticServerUpdates": "Enable automatic server updates",
     "OptionEnableExternalContentInSuggestions": "Enable external content in suggestions",
     "OptionEnableExternalContentInSuggestionsHelp": "Allow internet trailers and live TV programs to be included within suggested content.",
     "OptionEnableForAllTuners": "Enable for all tuner devices",