Merge branch 'development' into 'master'

fix(Npcs):  shouldnt print "in" if location is not set

See merge request !96

src/components/Npc/NpcRow.vue

@@ -39,7 +39,7 @@
                     <template #default>
                         <VCard dark>
                             <VToolbar>
-                                <VToolbarTitle>{{ npc.name }} - Death</VToolbarTitle>
+                                <VToolbarTitle>{{ npc.name }} - {{ npc.dead ? 'Alive' : 'Dead' }}?</VToolbarTitle>
                                 <VBtn icon small @click="showDeathConfirmation = false">
                                     <VIcon>mdi-close</VIcon>
                                 </VBtn>
@@ -49,7 +49,7 @@
                                     <VCol>
                                         Are you sure you want to mark this NPC as
                                         {{ npc.dead ? 'alive' : 'dead' }}? <br />
-                                        {{ npc.name }} in {{ npc.location }}
+                                        {{ npc.name }} <template v-if="npc.location">in {{ npc.location }}</template>
                                     </VCol>
                                 </VRow>
                                 <VRow>