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, 2 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 6e196144c..14bdab094 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -8,14 +8,14 @@ import AutoLaunch from 'auto-launch';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
-import { CHECK_INTERVAL } from '../config';
+import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { isMac } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
 import Miner from '../lib/Miner';
 
 const { app, powerMonitor } = remote;
-const defaultLocale = 'en-US';
+const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
   name: 'Franz',
 });