Merge branch 'master' into homepage-sasjs-executor

Conflicts:
	api/src/app.ts
	api/src/routes/index.ts
	api/src/routes/spec/routes.spec.ts

api/src/app.ts

@@ -1,11 +1,16 @@
 import express from 'express'
-import indexRouter from './routes'
-import path from 'path'
+import webRouter from './routes/web'
+import apiRouter from './routes/api'
 import { getWebBuildFolderPath } from './utils'
+
 const app = express()
 
 app.use(express.json({ limit: '50mb' }))
-app.use('/', indexRouter)
+
+app.use('/', webRouter)
+app.use('/SASjsApi', apiRouter)
+app.use(express.json({ limit: '50mb' }))
+
 app.use(express.static(getWebBuildFolderPath()))
 
 export default app