Merge remote-tracking branch 'origin/master'

# Conflicts:
#	changelog.md
#	package.json
#	src/components/Header/Header.vue
#	yarn.lock

Author: Blari

src/pages/Dashboard/components/BigStat/BigStat.vue

@@ -16,7 +16,7 @@
         </b-dropdown>
       </div>
       <div class="px-5">
-        <h4 class="fw-semi-bold mb-lg mt-sm">{{total}}</h4>
+        <h4 class="fw-semi-bold mb-sm mt-sm">{{total}}</h4>
         <div class="d-flex">
           <div class="w-50 py-3 pr-2">
             <div class="d-flex align-items-start">

src/pages/Notifications/Notifications.vue

@@ -15,22 +15,22 @@
             to change notifications position:</p>
           <div class="location-selector">
             <div
-              class="bit top left" @click="toggleLocation('top-left')"
+                    class="bit top left" @click="toggleLocation('top-left')"
             />
             <div
-              class="bit top right" @click="toggleLocation('top-right')"
+                    class="bit top right" @click="toggleLocation('top-right')"
             />
             <div
-              class="bit top" @click="toggleLocation('top-center')"
+                    class="bit top" @click="toggleLocation('top-center')"
             />
             <div
-              class="bit bottom left" @click="toggleLocation('bottom-left')"
+                    class="bit bottom left" @click="toggleLocation('bottom-left')"
             />
             <div
-              class="bit bottom right" @click="toggleLocation('bottom-right')"
+                    class="bit bottom right" @click="toggleLocation('bottom-right')"
             />
             <div
-              class="bit bottom" @click="toggleLocation('bottom-center')"
+                    class="bit bottom" @click="toggleLocation('bottom-center')"
             />
           </div>
         </b-col>