Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	macro_pad_apps/example.json

macro_pad_apps/example.json

@@ -4,10 +4,7 @@
     "k2":["TWO"],
     "k3":["THREE"],
     "k4":["ONE"],
-    "k5":{
+    "k5":["TWO"],
-    "keys":["TWO"],
-    "name":""
-    }
     "k6":["THREE"],
     "k7":["ONE"],
     "k8":["TWO"],
@@ -16,5 +13,3 @@
     "k11":["TWO"],
     "k12":["THREE"],
 }
-
-example.k1.name