Fix develop (#12039)

Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.

* force utf8 encoding

* correctly merge layouts and layout aliases

* show what aliases point to

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

[Keyboard] Evk v1.3 add a key (#11880)

Co-authored-by: Ryan <fauxpark@gmail.com>

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

[Keyboard] Add VIA support to SX60 and update default keymap (#11908)

Format code according to conventions (#12024)

Co-authored-by: QMK Bot <hello@qmk.fm>

[BUG] Massdrop develop rgb fix (#12022)

* Allow for disabling RGB_MATRIX on Massdrop boards.

* Fixup init sequence.

* Make some functions static as they've got very generic names.

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

[Keyboard] Fixup issues with Titan65 (#12002)

* [Keyboard] Titan64 - Fix RGB Matrix config

* Fix up keymaps

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

V-USB suspend refactor (#11891)

make LAYOUT parsing more robust

ChibiOS conf upgrade for daji/seis_cinco (#12001)

daji/seis_cinco - f9ce55c07a61f20308dab7eb5f4f2b7a91686625

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

[Keyboard] Atlas alps/mx PCB addition (#11884)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

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

[Keyboard] CapsUnlocked CU80 v2 (#11736)

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Rys Sommefeldt <rys@pixeltards.com>

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

[Keymap] Drashna Updates - Split+OLED edition (#11968)

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