Merge branch 'test' into 'dev'

# Conflicts:
#   src/assets/config/m3apps.test.json

src/assets/config/m3apps.test.json

@@ -122,66 +122,6 @@
            "states": ["RUNNING"]
        }
    ],
-    "localbind": true,
-    "applist": null
-  },
-  { "name": "divider"},
-  { "url": null,
-    "name": "File Explorer",
-    "startscript": "#!/bin/bash\n/usr/local/sv2/cloudcmd/start.sh\n ",
-    "instactions": [ 
-        {
-            "name": "Connect",
-            "paramscmd": "/usr/local/sv2/dev/cloudcmd/params.py {jobid}",
-            "client": {"cmd": null, "redir": "", "usebasicauth": true },
-            "states": ["RUNNING"]
-        },
-        {
-            "name": "View log",
-            "paramscmd": "/usr/local/sv2/dev/desktop/logparams.py {jobid}",
-            "client": {"cmd": null, "redir": "index.html?token={token}" },
-            "states": ["RUNNING","Finished"]
-        },
-        {
-            "name": "View Usage",
-            "paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
-            "client": {"cmd": null, "redir": "index.html?token={token}" },
-            "states": ["Finished"]
-        },
-        {
-            "name": "Remove log",
-            "paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
-            "client": null,
-            "states": ["Finished"]
-        }
-    ],
-    "localbind": true,
-    "applist": null
-  },
-  {
-  "name": "History",
-  "startscript": "#!/bin/bash\n/usr/local/sv2/dev/desktop/desktop.slurm\n ",
-  "actions": [ 
-       {
-           "name": "Connect",
-           "paramscmd": "/usr/local/sv2/dev/jupyter/jupyter_params.py {jobid}",
-           "client": {"cmd": null, "redir": "?token={token}"},
-           "states": ["RUNNING"]
-       },
-        {
-            "name": "View Usage",
-            "paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
-            "client": {"cmd": null, "redir": "index.html?token={token}" },
-            "states": ["Finished"]
-        },
-       {
-           "name": "Remove log",
-           "paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
-           "client": null,
-           "states": ["Finished"]
-       }
-    ],
-
     "localbind": true,
     "applist": null
   }