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

# Conflicts:
#	src/main/java/uno/mloluyu/desktop/CharacterSelectScreen.java
#	src/main/java/uno/mloluyu/versatile/FighterController.java

target/classes/ui/uiskin.atlas

@@ -1,24 +0,0 @@
-uiskin.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-button-up
-  rotate: false
-  xy: 0, 0
-  size: 200, 60
-  split: 10, 10, 10, 10
-  orig: 200, 60
-  offset: 0, 0
-button-down
-  rotate: false
-  xy: 0, 60
-  size: 200, 60
-  split: 10, 10, 10, 10
-  orig: 200, 60
-  offset: 0, 0
-white
-  rotate: false
-  xy: 0, 120
-  size: 1, 1
-  orig: 1, 1
-  offset: 0, 0