Merge branch 'develop' into 'feature/meeting_document_types'

# Conflicts:
#   electron/main/script.js
#   main.js

main.js

@@ -124,10 +124,12 @@ electron.ipcMain.handle('get-module-names', async () => {
 //     mainWindow.webContents.send("modules", module_array)
 // })
 
-
+var globalArgs = {}
+var globalFinalHtmlPath = ""
 
 electron.ipcMain.on("file_submit", async (event, args) => {
     try {
+        globalArgs = args
         let curstep = 0
         let totalsteps = 4
 
@@ -230,6 +232,9 @@ electron.ipcMain.on("file_submit", async (event, args) => {
     }
 })
 
+electron.ipcMain.on("file_download", async() => {
+    await mapFunctions.get("htmlDocumentConverter").convert({inputPath:globalFinalHtmlPath, format: globalArgs.document.outputType, showDialog: true});
+})
 
 
 let q =