Merge branch 'develop' into feature/mute-service

# Conflicts:
#	src/components/services/content/ServiceWebview.js
#	src/components/services/content/Services.js
#	src/components/services/tabs/TabItem.js
#	src/containers/layout/AppLayoutContainer.js

1 files changed, 2 insertions, 1 deletions

diff --git a/src/config.js b/src/config.js
index 651f2e174..1627993f5 100644
--- a/src/config.js
+++ b/src/config.js
@@ -10,7 +10,8 @@ export const DEFAULT_APP_SETTINGS = {
   runInBackground: false,
   enableSystemTray: true,
   minimizeToSystemTray: false,
-  locale: 'en-us', // TODO: Replace with proper solution once translations are in
+  showDisabledServices: true,
+  locale: 'en-US',
   beta: false,
   isAppMuted: false,
 };