Merge remote-tracking branch 'origin/master' into develop

keyboards/tokyokeyboard/alix40/info.json

@@ -163,27 +163,27 @@
             },
             {
                 "label": "N",
-                "x": 7.25,
+                "x": 8.25,
                 "y": 2
             },
             {
                 "label": "M",
-                "x": 7.25,
+                "x": 9.25,
                 "y": 2
             },
             {
                 "label": ",",
-                "x": 7.25,
+                "x": 10.25,
                 "y": 2
             },
             {
                 "label": ".",
-                "x": 7.25,
+                "x": 11.25,
                 "y": 2
             },
             {
                 "label": "/",
-                "x": 7.25,
+                "x": 12.25,
                 "y": 2
             },
             {