Desktop: Fixed broken menu bar

ElectronClient/app/app.js

@@ -535,7 +535,7 @@ class Application extends BaseApplication {
 			},
 		});
 
-		const toolsItems = toolsItemsFirst.push({
+		const toolsItems = toolsItemsFirst.concat([{
 			label: _('Options'),
 			visible: !shim.isMac(),
 			accelerator: 'CommandOrControl+,',
@@ -545,7 +545,7 @@ class Application extends BaseApplication {
 					routeName: 'Config',
 				});
 			},
-		});
+		}]);
 
 		function _checkForUpdates(ctx) {
 			bridge().checkForUpdates(false, bridge().window(), ctx.checkForUpdateLoggerPath(), { includePreReleases: Setting.value('autoUpdate.includePreReleases') });

ReactNativeClient/start_emulator.bat

@@ -1 +0,0 @@
-c:\Users\Laurent\AppData\Local\Android\sdk\tools\emulator.exe -avd Nexus_5X_API_23_Google_API_