Merge branch 'master' into public-dashboard

# Conflicts:
#	src/components/MonitorList.vue
#	src/icon.js

src/mixins/socket.js

@@ -287,6 +287,10 @@ export default {
             socket.emit("twoFAStatus", callback)
         },
 
+        getMonitorList(callback) {
+            socket.emit("getMonitorList", callback)
+        },
+
         add(monitor, callback) {
             socket.emit("add", monitor, callback)
         },