Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor

# Conflicts:
#	src/languages/en.js
#	src/pages/EditMonitor.vue

src/components/Tag.vue

@@ -47,7 +47,7 @@ export default {
     },
     computed: {
         displayText() {
-            if (this.item.value === "") {
+            if (this.item.value === "" || this.item.value === undefined) {
                 return this.item.name;
             } else {
                 return `${this.item.name}: ${this.item.value}`;