Merge remote-tracking branch 'origin/master' into windows

Conflicts:
	browser/main/HomePage.js
	browser/main/HomePage/ArticleNavigator.js
	webpack.config.js

atom-lib/menu-template.js

@@ -1,4 +1,6 @@
-var BrowserWindow = require('browser-window')
+const electron = require('electron')
+const BrowserWindow = electron.BrowserWindow
+const shell = electron.shell
 
 module.exports = [
   {
@@ -91,10 +93,13 @@ module.exports = [
         }
       },
       {
-        label: 'Toggle DevTools',
-        accelerator: 'Alt+Command+I',
-        click: function () {
-          BrowserWindow.getFocusedWindow().toggleDevTools()
+        label: 'Toggle Developer Tools',
+        accelerator: (function () {
+          if (process.platform === 'darwin') return 'Alt+Command+I'
+          else return 'Ctrl+Shift+I'
+        })(),
+        click: function (item, focusedWindow) {
+          if (focusedWindow) BrowserWindow.getFocusedWindow().toggleDevTools()
         }
       }
     ]
@@ -123,6 +128,24 @@ module.exports = [
   },
   {
     label: 'Help',
-    submenu: []
+    role: 'help',
+    submenu: [
+      {
+        label: 'Boost official site',
+        click: function () { shell.openExternal('https://b00st.io/') }
+      },
+      {
+        label: 'Tutorial page',
+        click: function () { shell.openExternal('https://b00st.io/tutorial.html') }
+      },
+      {
+        label: 'Discussions',
+        click: function () { shell.openExternal('https://github.com/BoostIO/boost-app-discussions/issues') }
+      },
+      {
+        label: 'Changelog',
+        click: function () { shell.openExternal('https://github.com/BoostIO/boost-releases/blob/master/changelog.md') }
+      }
+    ]
   }
 ]