keep capital of the kingdom that conquers

when merging two or more kingdoms
closes #19
related to #4

Author: Sesu8642

core/src/main/java/de/sesu8642/feudaltactics/gamelogic/gamestate/GameStateHelper.java

@@ -477,7 +477,7 @@ public static void conquer(GameState gameState, HexTile tile) {
 				// handle kingdom
 				if (neighborTile.getPlayer() == tile.getPlayer() && neighborTile.getKingdom() != tile.getKingdom()) {
 					// combine kingdoms if owned by the same player
-					combineKingdoms(gameState, neighborTile.getKingdom(), tile.getKingdom());
+					combineKingdoms(gameState, tile.getKingdom(), neighborTile.getKingdom());
 					gameState.setActiveKingdom(neighborTile.getKingdom());
 					neighborTile.getKingdom().setWasActiveInCurrentTurn(true);
 				} else if (neighborTile.getKingdom() == oldTileKingdom) {