Merge branch 'dev' into dev-countup

package.json

@@ -110,7 +110,7 @@
     "@fullcalendar/timegrid": "4.3.0",
     "apexcharts": "3.11.2",
     "autosize": "4.0.2",
-    "bootstrap": "twbs/bootstrap#c6cfc23",
+    "bootstrap": "twbs/bootstrap#167a93a",
     "countup.js": "2.0.4",
     "fullcalendar": "3.10.1",
     "imask": "5.2.1",