resolved merge conflicts

...kersClient/core/src/com/mygdx/game/UniCheckersClient.java

...t/core/src/com/mygdx/game/controllers/GameController.java

CheckersClient/core/src/com/mygdx/game/controllers/Utils.kt

CheckersClient/core/src/com/mygdx/game/model/Game.kt

CheckersClient/core/src/com/mygdx/game/model/GameState.kt

CheckersClient/core/src/com/mygdx/game/model/Piece.kt

...rc/com/mygdx/game/model/gamemodes/boards/AbstractBoard.kt

...src/com/mygdx/game/model/gamemodes/boards/DefaultBoard.kt

.../src/com/mygdx/game/model/gamemodes/rules/DefaultRules.kt

CheckersClient/core/src/com/mygdx/game/views/Constants.java

CheckersClient/core/src/com/mygdx/game/views/PlayView.java

...lient/core/src/com/mygdx/game/views/tokens/StarPiece.java