301 files changed, 46 insertions, 2 deletions

diff --git a/build.gradle b/backend/build.gradle
index 082673dd..61e8960b 100644
--- a/build.gradle
+++ b/backend/build.gradle
@@ -33,4 +33,12 @@ dependencies {
     compile 'org.webjars:jquery:3.1.0'
 
     testCompile 'org.springframework.boot:spring-boot-starter-test'
-}
\ No newline at end of file
+}
+
+jar {
+    from('../frontend/dist') {
+        into 'static'
+    }
+}
+
+jar.dependsOn(':frontend:assemble')
\ No newline at end of file
diff --git a/src/main/java/org/luxons/sevenwonders/SevenWonders.java b/backend/src/main/java/org/luxons/sevenwonders/SevenWonders.java
index 2c20c5d3..2c20c5d3 100644
--- a/src/main/java/org/luxons/sevenwonders/SevenWonders.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/SevenWonders.java
diff --git a/src/main/java/org/luxons/sevenwonders/actions/ChooseNameAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/ChooseNameAction.java
index 42a26f37..42a26f37 100644
--- a/src/main/java/org/luxons/sevenwonders/actions/ChooseNameAction.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/actions/ChooseNameAction.java
diff --git a/src/main/java/org/luxons/sevenwonders/actions/CreateGameAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/CreateGameAction.java
index ce1783c0..ce1783c0 100644
--- a/src/main/java/org/luxons/sevenwonders/actions/CreateGameAction.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/actions/CreateGameAction.java
diff --git a/src/main/java/org/luxons/sevenwonders/actions/JoinGameAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/JoinGameAction.java
index 82bff168..82bff168 100644
--- a/src/main/java/org/luxons/sevenwonders/actions/JoinGameAction.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/actions/JoinGameAction.java
diff --git a/src/main/java/org/luxons/sevenwonders/actions/PrepareCardAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/PrepareCardAction.java
index b333d6c1..b333d6c1 100644
--- a/src/main/java/org/luxons/sevenwonders/actions/PrepareCardAction.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/actions/PrepareCardAction.java
diff --git a/src/main/java/org/luxons/sevenwonders/actions/ReorderPlayersAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/ReorderPlayersAction.java
index 803a71d8..803a71d8 100644
--- a/src/main/java/org/luxons/sevenwonders/actions/ReorderPlayersAction.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/actions/ReorderPlayersAction.java
diff --git a/src/main/java/org/luxons/sevenwonders/actions/UpdateSettingsAction.java b/backend/src/main/java/org/luxons/sevenwonders/actions/UpdateSettingsAction.java
index 822a5a1c..822a5a1c 100644
--- a/src/main/java/org/luxons/sevenwonders/actions/UpdateSettingsAction.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/actions/UpdateSettingsAction.java
diff --git a/src/main/java/org/luxons/sevenwonders/config/AnonymousUsersHandshakeHandler.java b/backend/src/main/java/org/luxons/sevenwonders/config/AnonymousUsersHandshakeHandler.java
index bebbd477..bebbd477 100644
--- a/src/main/java/org/luxons/sevenwonders/config/AnonymousUsersHandshakeHandler.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/config/AnonymousUsersHandshakeHandler.java
diff --git a/src/main/java/org/luxons/sevenwonders/config/TopicSubscriptionInterceptor.java b/backend/src/main/java/org/luxons/sevenwonders/config/TopicSubscriptionInterceptor.java
index f8d92068..f8d92068 100644
--- a/src/main/java/org/luxons/sevenwonders/config/TopicSubscriptionInterceptor.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/config/TopicSubscriptionInterceptor.java
diff --git a/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java b/backend/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java
index d54d8da4..d54d8da4 100644
--- a/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/config/WebSocketConfig.java
diff --git a/src/main/java/org/luxons/sevenwonders/controllers/GameController.java b/backend/src/main/java/org/luxons/sevenwonders/controllers/GameController.java
index 0deac4a3..0deac4a3 100644
--- a/src/main/java/org/luxons/sevenwonders/controllers/GameController.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/controllers/GameController.java
diff --git a/src/main/java/org/luxons/sevenwonders/controllers/LobbyController.java b/backend/src/main/java/org/luxons/sevenwonders/controllers/LobbyController.java
index 996ea361..996ea361 100644
--- a/src/main/java/org/luxons/sevenwonders/controllers/LobbyController.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/controllers/LobbyController.java
diff --git a/src/main/java/org/luxons/sevenwonders/errors/ApiMisuseException.java b/backend/src/main/java/org/luxons/sevenwonders/errors/ApiMisuseException.java
index 0d7d1a82..0d7d1a82 100644
--- a/src/main/java/org/luxons/sevenwonders/errors/ApiMisuseException.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/errors/ApiMisuseException.java
diff --git a/src/main/java/org/luxons/sevenwonders/errors/ErrorType.java b/backend/src/main/java/org/luxons/sevenwonders/errors/ErrorType.java
index 1cd18d09..1cd18d09 100644
--- a/src/main/java/org/luxons/sevenwonders/errors/ErrorType.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/errors/ErrorType.java
diff --git a/src/main/java/org/luxons/sevenwonders/errors/ExceptionHandler.java b/backend/src/main/java/org/luxons/sevenwonders/errors/ExceptionHandler.java
index 628da4f8..628da4f8 100644
--- a/src/main/java/org/luxons/sevenwonders/errors/ExceptionHandler.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/errors/ExceptionHandler.java
diff --git a/src/main/java/org/luxons/sevenwonders/errors/UIError.java b/backend/src/main/java/org/luxons/sevenwonders/errors/UIError.java
index ee5fcbe0..ee5fcbe0 100644
--- a/src/main/java/org/luxons/sevenwonders/errors/UIError.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/errors/UIError.java
diff --git a/src/main/java/org/luxons/sevenwonders/errors/UIErrorDetail.java b/backend/src/main/java/org/luxons/sevenwonders/errors/UIErrorDetail.java
index dc4250bb..dc4250bb 100644
--- a/src/main/java/org/luxons/sevenwonders/errors/UIErrorDetail.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/errors/UIErrorDetail.java
diff --git a/src/main/java/org/luxons/sevenwonders/errors/UserInputException.java b/backend/src/main/java/org/luxons/sevenwonders/errors/UserInputException.java
index 4033a696..4033a696 100644
--- a/src/main/java/org/luxons/sevenwonders/errors/UserInputException.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/errors/UserInputException.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/Game.java b/backend/src/main/java/org/luxons/sevenwonders/game/Game.java
index 8aa7d1b9..8aa7d1b9 100644
--- a/src/main/java/org/luxons/sevenwonders/game/Game.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/Game.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/Lobby.java b/backend/src/main/java/org/luxons/sevenwonders/game/Lobby.java
index 6975349a..6975349a 100644
--- a/src/main/java/org/luxons/sevenwonders/game/Lobby.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/Lobby.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/Player.java b/backend/src/main/java/org/luxons/sevenwonders/game/Player.java
index f1095049..f1095049 100644
--- a/src/main/java/org/luxons/sevenwonders/game/Player.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/Player.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/Settings.java b/backend/src/main/java/org/luxons/sevenwonders/game/Settings.java
index 63ef3522..63ef3522 100644
--- a/src/main/java/org/luxons/sevenwonders/game/Settings.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/Settings.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/State.java b/backend/src/main/java/org/luxons/sevenwonders/game/State.java
index 0bd71d3a..0bd71d3a 100644
--- a/src/main/java/org/luxons/sevenwonders/game/State.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/State.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/api/Action.java b/backend/src/main/java/org/luxons/sevenwonders/game/api/Action.java
index 88e392f9..88e392f9 100644
--- a/src/main/java/org/luxons/sevenwonders/game/api/Action.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/api/Action.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/api/CustomizableSettings.java b/backend/src/main/java/org/luxons/sevenwonders/game/api/CustomizableSettings.java
index c270a2af..c270a2af 100644
--- a/src/main/java/org/luxons/sevenwonders/game/api/CustomizableSettings.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/api/CustomizableSettings.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/api/HandCard.java b/backend/src/main/java/org/luxons/sevenwonders/game/api/HandCard.java
index 54045607..54045607 100644
--- a/src/main/java/org/luxons/sevenwonders/game/api/HandCard.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/api/HandCard.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/api/PlayerMove.java b/backend/src/main/java/org/luxons/sevenwonders/game/api/PlayerMove.java
index 6d2889e0..6d2889e0 100644
--- a/src/main/java/org/luxons/sevenwonders/game/api/PlayerMove.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/api/PlayerMove.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/api/PlayerTurnInfo.java b/backend/src/main/java/org/luxons/sevenwonders/game/api/PlayerTurnInfo.java
index 1ff6f541..1ff6f541 100644
--- a/src/main/java/org/luxons/sevenwonders/game/api/PlayerTurnInfo.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/api/PlayerTurnInfo.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/api/PreparedCard.java b/backend/src/main/java/org/luxons/sevenwonders/game/api/PreparedCard.java
index 85cac1de..85cac1de 100644
--- a/src/main/java/org/luxons/sevenwonders/game/api/PreparedCard.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/api/PreparedCard.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/api/Table.java b/backend/src/main/java/org/luxons/sevenwonders/game/api/Table.java
index 8b831527..8b831527 100644
--- a/src/main/java/org/luxons/sevenwonders/game/api/Table.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/api/Table.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/boards/Board.java b/backend/src/main/java/org/luxons/sevenwonders/game/boards/Board.java
index ab557d38..ab557d38 100644
--- a/src/main/java/org/luxons/sevenwonders/game/boards/Board.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/boards/Board.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/boards/BoardElementType.java b/backend/src/main/java/org/luxons/sevenwonders/game/boards/BoardElementType.java
index e50f4ea0..e50f4ea0 100644
--- a/src/main/java/org/luxons/sevenwonders/game/boards/BoardElementType.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/boards/BoardElementType.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/boards/Military.java b/backend/src/main/java/org/luxons/sevenwonders/game/boards/Military.java
index fb93fa96..fb93fa96 100644
--- a/src/main/java/org/luxons/sevenwonders/game/boards/Military.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/boards/Military.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.java b/backend/src/main/java/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.java
index 16b2f3a9..16b2f3a9 100644
--- a/src/main/java/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/boards/RelativeBoardPosition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/boards/Science.java b/backend/src/main/java/org/luxons/sevenwonders/game/boards/Science.java
index 34928bcc..34928bcc 100644
--- a/src/main/java/org/luxons/sevenwonders/game/boards/Science.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/boards/Science.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/boards/ScienceType.java b/backend/src/main/java/org/luxons/sevenwonders/game/boards/ScienceType.java
index 06408b9e..06408b9e 100644
--- a/src/main/java/org/luxons/sevenwonders/game/boards/ScienceType.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/boards/ScienceType.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/cards/Card.java b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Card.java
index de674011..de674011 100644
--- a/src/main/java/org/luxons/sevenwonders/game/cards/Card.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Card.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/cards/CardBack.java b/backend/src/main/java/org/luxons/sevenwonders/game/cards/CardBack.java
index f925b6c4..f925b6c4 100644
--- a/src/main/java/org/luxons/sevenwonders/game/cards/CardBack.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/cards/CardBack.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/cards/Color.java b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Color.java
index 5b4e4473..5b4e4473 100644
--- a/src/main/java/org/luxons/sevenwonders/game/cards/Color.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Color.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/cards/Decks.java b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Decks.java
index aa2b00bf..aa2b00bf 100644
--- a/src/main/java/org/luxons/sevenwonders/game/cards/Decks.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Decks.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/cards/HandRotationDirection.java b/backend/src/main/java/org/luxons/sevenwonders/game/cards/HandRotationDirection.java
index 9c4f4b02..9c4f4b02 100644
--- a/src/main/java/org/luxons/sevenwonders/game/cards/HandRotationDirection.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/cards/HandRotationDirection.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/cards/Hands.java b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Hands.java
index 4a8bc143..4a8bc143 100644
--- a/src/main/java/org/luxons/sevenwonders/game/cards/Hands.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Hands.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/cards/Requirements.java b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Requirements.java
index f6d7934c..f6d7934c 100644
--- a/src/main/java/org/luxons/sevenwonders/game/cards/Requirements.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/cards/Requirements.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/GameDefinition.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/GameDefinition.java
index 4c63718b..4c63718b 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/GameDefinition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/GameDefinition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/GameDefinitionLoader.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/GameDefinitionLoader.java
index 30457d86..30457d86 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/GameDefinitionLoader.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/GameDefinitionLoader.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/CardDefinition.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/CardDefinition.java
index 621bed2c..621bed2c 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/CardDefinition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/CardDefinition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.java
index 6f97e55f..6f97e55f 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/DecksDefinition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/Definition.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/Definition.java
index 6c6b4b19..6c6b4b19 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/Definition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/Definition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.java
index e35463d4..e35463d4 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/EffectsDefinition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.java
index a972a517..a972a517 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderDefinition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSide.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSide.java
index 08c85f57..08c85f57 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSide.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSide.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSideDefinition.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSideDefinition.java
index 9b2bc2d5..9b2bc2d5 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSideDefinition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSideDefinition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethod.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethod.java
index 08aaad14..08aaad14 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethod.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethod.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderStageDefinition.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderStageDefinition.java
index 887b414a..887b414a 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderStageDefinition.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/definitions/WonderStageDefinition.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.java
index c1a51f24..c1a51f24 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializer.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.java
index 6c70a44d..6c70a44d 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializer.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.java
index 145063eb..145063eb 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializer.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.java
index 8aca5561..8aca5561 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializer.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.java
index efeafd15..efeafd15 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializer.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.java b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.java
index b6e38540..b6e38540 100644
--- a/src/main/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializer.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.java
index e9f9fe5f..e9f9fe5f 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElement.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/Discount.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/Discount.java
index 3a44574b..3a44574b 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/Discount.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/Discount.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/Effect.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/Effect.java
index 692eaea0..692eaea0 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/Effect.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/Effect.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/EndGameEffect.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/EndGameEffect.java
index 1bae16a6..1bae16a6 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/EndGameEffect.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/EndGameEffect.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/GoldIncrease.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/GoldIncrease.java
index 79e7bd1a..79e7bd1a 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/GoldIncrease.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/GoldIncrease.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.java
index 8f4340cf..8f4340cf 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/InstantOwnBoardEffect.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.java
index b08e2f59..b08e2f59 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcements.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/ProductionIncrease.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/ProductionIncrease.java
index 9724dfcd..9724dfcd 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/ProductionIncrease.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/ProductionIncrease.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/RawPointsIncrease.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/RawPointsIncrease.java
index 0d117cec..0d117cec 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/RawPointsIncrease.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/RawPointsIncrease.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/ScienceProgress.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/ScienceProgress.java
index 4e6764ee..4e6764ee 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/ScienceProgress.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/ScienceProgress.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbility.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbility.java
index 5de87784..5de87784 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbility.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbility.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.java b/backend/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.java
index a5953c2f..a5953c2f 100644
--- a/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivation.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/moves/BuildWonderMove.java b/backend/src/main/java/org/luxons/sevenwonders/game/moves/BuildWonderMove.java
index bddd6ec6..bddd6ec6 100644
--- a/src/main/java/org/luxons/sevenwonders/game/moves/BuildWonderMove.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/moves/BuildWonderMove.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/moves/CardFromHandMove.java b/backend/src/main/java/org/luxons/sevenwonders/game/moves/CardFromHandMove.java
index 7bbee1e5..7bbee1e5 100644
--- a/src/main/java/org/luxons/sevenwonders/game/moves/CardFromHandMove.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/moves/CardFromHandMove.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/moves/CopyGuildMove.java b/backend/src/main/java/org/luxons/sevenwonders/game/moves/CopyGuildMove.java
index 5ebde772..5ebde772 100644
--- a/src/main/java/org/luxons/sevenwonders/game/moves/CopyGuildMove.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/moves/CopyGuildMove.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/moves/DiscardMove.java b/backend/src/main/java/org/luxons/sevenwonders/game/moves/DiscardMove.java
index 076a593c..076a593c 100644
--- a/src/main/java/org/luxons/sevenwonders/game/moves/DiscardMove.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/moves/DiscardMove.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/moves/Move.java b/backend/src/main/java/org/luxons/sevenwonders/game/moves/Move.java
index 8b6b60a8..8b6b60a8 100644
--- a/src/main/java/org/luxons/sevenwonders/game/moves/Move.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/moves/Move.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/moves/MoveType.java b/backend/src/main/java/org/luxons/sevenwonders/game/moves/MoveType.java
index bf64344d..bf64344d 100644
--- a/src/main/java/org/luxons/sevenwonders/game/moves/MoveType.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/moves/MoveType.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/moves/PlayCardMove.java b/backend/src/main/java/org/luxons/sevenwonders/game/moves/PlayCardMove.java
index affebc4a..affebc4a 100644
--- a/src/main/java/org/luxons/sevenwonders/game/moves/PlayCardMove.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/moves/PlayCardMove.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.java b/backend/src/main/java/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.java
index fb28b09c..fb28b09c 100644
--- a/src/main/java/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/moves/PlayFreeCardMove.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/resources/BoughtResources.java b/backend/src/main/java/org/luxons/sevenwonders/game/resources/BoughtResources.java
index ec261c8c..ec261c8c 100644
--- a/src/main/java/org/luxons/sevenwonders/game/resources/BoughtResources.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/resources/BoughtResources.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/resources/Production.java b/backend/src/main/java/org/luxons/sevenwonders/game/resources/Production.java
index b7701c27..b7701c27 100644
--- a/src/main/java/org/luxons/sevenwonders/game/resources/Production.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/resources/Production.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/resources/Provider.java b/backend/src/main/java/org/luxons/sevenwonders/game/resources/Provider.java
index 9c4aa3f9..9c4aa3f9 100644
--- a/src/main/java/org/luxons/sevenwonders/game/resources/Provider.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/resources/Provider.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/resources/ResourceType.java b/backend/src/main/java/org/luxons/sevenwonders/game/resources/ResourceType.java
index 46d60123..46d60123 100644
--- a/src/main/java/org/luxons/sevenwonders/game/resources/ResourceType.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/resources/ResourceType.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/resources/Resources.java b/backend/src/main/java/org/luxons/sevenwonders/game/resources/Resources.java
index 5bf6f269..5bf6f269 100644
--- a/src/main/java/org/luxons/sevenwonders/game/resources/Resources.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/resources/Resources.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/resources/TradingRules.java b/backend/src/main/java/org/luxons/sevenwonders/game/resources/TradingRules.java
index 19409844..19409844 100644
--- a/src/main/java/org/luxons/sevenwonders/game/resources/TradingRules.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/resources/TradingRules.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/scoring/PlayerScore.java b/backend/src/main/java/org/luxons/sevenwonders/game/scoring/PlayerScore.java
index 42acec54..42acec54 100644
--- a/src/main/java/org/luxons/sevenwonders/game/scoring/PlayerScore.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/scoring/PlayerScore.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreBoard.java b/backend/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreBoard.java
index 26b5f8ba..26b5f8ba 100644
--- a/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreBoard.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreBoard.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreCategory.java b/backend/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreCategory.java
index 54976072..54976072 100644
--- a/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreCategory.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/scoring/ScoreCategory.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/wonders/Wonder.java b/backend/src/main/java/org/luxons/sevenwonders/game/wonders/Wonder.java
index 3ddddd30..3ddddd30 100644
--- a/src/main/java/org/luxons/sevenwonders/game/wonders/Wonder.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/wonders/Wonder.java
diff --git a/src/main/java/org/luxons/sevenwonders/game/wonders/WonderStage.java b/backend/src/main/java/org/luxons/sevenwonders/game/wonders/WonderStage.java
index 64d506fc..64d506fc 100644
--- a/src/main/java/org/luxons/sevenwonders/game/wonders/WonderStage.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/game/wonders/WonderStage.java
diff --git a/src/main/java/org/luxons/sevenwonders/repositories/GameRepository.java b/backend/src/main/java/org/luxons/sevenwonders/repositories/GameRepository.java
index efe39b85..efe39b85 100644
--- a/src/main/java/org/luxons/sevenwonders/repositories/GameRepository.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/repositories/GameRepository.java
diff --git a/src/main/java/org/luxons/sevenwonders/repositories/LobbyRepository.java b/backend/src/main/java/org/luxons/sevenwonders/repositories/LobbyRepository.java
index 8f305791..8f305791 100644
--- a/src/main/java/org/luxons/sevenwonders/repositories/LobbyRepository.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/repositories/LobbyRepository.java
diff --git a/src/main/java/org/luxons/sevenwonders/repositories/PlayerRepository.java b/backend/src/main/java/org/luxons/sevenwonders/repositories/PlayerRepository.java
index 049c5ef9..049c5ef9 100644
--- a/src/main/java/org/luxons/sevenwonders/repositories/PlayerRepository.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/repositories/PlayerRepository.java
diff --git a/src/main/java/org/luxons/sevenwonders/validation/DestinationAccessValidator.java b/backend/src/main/java/org/luxons/sevenwonders/validation/DestinationAccessValidator.java
index 65b3623c..65b3623c 100644
--- a/src/main/java/org/luxons/sevenwonders/validation/DestinationAccessValidator.java
+++ b/backend/src/main/java/org/luxons/sevenwonders/validation/DestinationAccessValidator.java
diff --git a/src/main/resources/org/luxons/sevenwonders/game/data/cards.json b/backend/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
index bf48e95a..bf48e95a 100644
--- a/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
+++ b/backend/src/main/resources/org/luxons/sevenwonders/game/data/cards.json
diff --git a/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json b/backend/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
index 9b4d0587..9b4d0587 100644
--- a/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
+++ b/backend/src/main/resources/org/luxons/sevenwonders/game/data/wonders.json
diff --git a/src/main/resources/static/app.js b/backend/src/main/resources/static/app.js
index 0d68d2ef..0d68d2ef 100644
--- a/src/main/resources/static/app.js
+++ b/backend/src/main/resources/static/app.js
diff --git a/src/main/resources/static/images/background.jpg b/backend/src/main/resources/static/images/background.jpg
index 57bdffcf..57bdffcf 100644
--- a/src/main/resources/static/images/background.jpg
+++ b/backend/src/main/resources/static/images/background.jpg
diff --git a/src/main/resources/static/images/cards/academy.png b/backend/src/main/resources/static/images/cards/academy.png
index d2a75075..d2a75075 100644
--- a/src/main/resources/static/images/cards/academy.png
+++ b/backend/src/main/resources/static/images/cards/academy.png
diff --git a/src/main/resources/static/images/cards/age1.png b/backend/src/main/resources/static/images/cards/age1.png
index a06332d7..a06332d7 100644
--- a/src/main/resources/static/images/cards/age1.png
+++ b/backend/src/main/resources/static/images/cards/age1.png
diff --git a/src/main/resources/static/images/cards/age2.png b/backend/src/main/resources/static/images/cards/age2.png
index 9b52aa4e..9b52aa4e 100644
--- a/src/main/resources/static/images/cards/age2.png
+++ b/backend/src/main/resources/static/images/cards/age2.png
diff --git a/src/main/resources/static/images/cards/age3.png b/backend/src/main/resources/static/images/cards/age3.png
index 86c983ee..86c983ee 100644
--- a/src/main/resources/static/images/cards/age3.png
+++ b/backend/src/main/resources/static/images/cards/age3.png
diff --git a/src/main/resources/static/images/cards/altar.png b/backend/src/main/resources/static/images/cards/altar.png
index bbde8f2f..bbde8f2f 100644
--- a/src/main/resources/static/images/cards/altar.png
+++ b/backend/src/main/resources/static/images/cards/altar.png
diff --git a/src/main/resources/static/images/cards/apothecary.png b/backend/src/main/resources/static/images/cards/apothecary.png
index 01804c0a..01804c0a 100644
--- a/src/main/resources/static/images/cards/apothecary.png
+++ b/backend/src/main/resources/static/images/cards/apothecary.png
diff --git a/src/main/resources/static/images/cards/aqueduct.png b/backend/src/main/resources/static/images/cards/aqueduct.png
index c29d9566..c29d9566 100644
--- a/src/main/resources/static/images/cards/aqueduct.png
+++ b/backend/src/main/resources/static/images/cards/aqueduct.png
diff --git a/src/main/resources/static/images/cards/archeryrange.png b/backend/src/main/resources/static/images/cards/archeryrange.png
index 15c6edda..15c6edda 100644
--- a/src/main/resources/static/images/cards/archeryrange.png
+++ b/backend/src/main/resources/static/images/cards/archeryrange.png
diff --git a/src/main/resources/static/images/cards/arena.png b/backend/src/main/resources/static/images/cards/arena.png
index 7dc76961..7dc76961 100644
--- a/src/main/resources/static/images/cards/arena.png
+++ b/backend/src/main/resources/static/images/cards/arena.png
diff --git a/src/main/resources/static/images/cards/arsenal.png b/backend/src/main/resources/static/images/cards/arsenal.png
index fc3f4a27..fc3f4a27 100644
--- a/src/main/resources/static/images/cards/arsenal.png
+++ b/backend/src/main/resources/static/images/cards/arsenal.png
diff --git a/src/main/resources/static/images/cards/barracks.png b/backend/src/main/resources/static/images/cards/barracks.png
index f5a68c17..f5a68c17 100644
--- a/src/main/resources/static/images/cards/barracks.png
+++ b/backend/src/main/resources/static/images/cards/barracks.png
diff --git a/src/main/resources/static/images/cards/baths.png b/backend/src/main/resources/static/images/cards/baths.png
index 3d99d59d..3d99d59d 100644
--- a/src/main/resources/static/images/cards/baths.png
+++ b/backend/src/main/resources/static/images/cards/baths.png
diff --git a/src/main/resources/static/images/cards/bazar.png b/backend/src/main/resources/static/images/cards/bazar.png
index f36e25c2..f36e25c2 100644
--- a/src/main/resources/static/images/cards/bazar.png
+++ b/backend/src/main/resources/static/images/cards/bazar.png
diff --git a/src/main/resources/static/images/cards/brickyard.png b/backend/src/main/resources/static/images/cards/brickyard.png
index ae0b7e9b..ae0b7e9b 100644
--- a/src/main/resources/static/images/cards/brickyard.png
+++ b/backend/src/main/resources/static/images/cards/brickyard.png
diff --git a/src/main/resources/static/images/cards/buildersguild.png b/backend/src/main/resources/static/images/cards/buildersguild.png
index f5402611..f5402611 100644
--- a/src/main/resources/static/images/cards/buildersguild.png
+++ b/backend/src/main/resources/static/images/cards/buildersguild.png
diff --git a/src/main/resources/static/images/cards/caravansery.png b/backend/src/main/resources/static/images/cards/caravansery.png
index 997bb102..997bb102 100644
--- a/src/main/resources/static/images/cards/caravansery.png
+++ b/backend/src/main/resources/static/images/cards/caravansery.png
diff --git a/src/main/resources/static/images/cards/chamberofcommerce.png b/backend/src/main/resources/static/images/cards/chamberofcommerce.png
index 44b5af28..44b5af28 100644
--- a/src/main/resources/static/images/cards/chamberofcommerce.png
+++ b/backend/src/main/resources/static/images/cards/chamberofcommerce.png
diff --git a/src/main/resources/static/images/cards/circus.png b/backend/src/main/resources/static/images/cards/circus.png
index b1ec4d8b..b1ec4d8b 100644
--- a/src/main/resources/static/images/cards/circus.png
+++ b/backend/src/main/resources/static/images/cards/circus.png
diff --git a/src/main/resources/static/images/cards/claypit.png b/backend/src/main/resources/static/images/cards/claypit.png
index 5442248e..5442248e 100644
--- a/src/main/resources/static/images/cards/claypit.png
+++ b/backend/src/main/resources/static/images/cards/claypit.png
diff --git a/src/main/resources/static/images/cards/claypool.png b/backend/src/main/resources/static/images/cards/claypool.png
index 873cad47..873cad47 100644
--- a/src/main/resources/static/images/cards/claypool.png
+++ b/backend/src/main/resources/static/images/cards/claypool.png
diff --git a/src/main/resources/static/images/cards/courthouse.png b/backend/src/main/resources/static/images/cards/courthouse.png
index 394901f2..394901f2 100644
--- a/src/main/resources/static/images/cards/courthouse.png
+++ b/backend/src/main/resources/static/images/cards/courthouse.png
diff --git a/src/main/resources/static/images/cards/craftsmensguild.png b/backend/src/main/resources/static/images/cards/craftsmensguild.png
index 09bff60e..09bff60e 100644
--- a/src/main/resources/static/images/cards/craftsmensguild.png
+++ b/backend/src/main/resources/static/images/cards/craftsmensguild.png
diff --git a/src/main/resources/static/images/cards/dispensary.png b/backend/src/main/resources/static/images/cards/dispensary.png
index 4917166b..4917166b 100644
--- a/src/main/resources/static/images/cards/dispensary.png
+++ b/backend/src/main/resources/static/images/cards/dispensary.png
diff --git a/src/main/resources/static/images/cards/easttradingpost.png b/backend/src/main/resources/static/images/cards/easttradingpost.png
index 0c67cc78..0c67cc78 100644
--- a/src/main/resources/static/images/cards/easttradingpost.png
+++ b/backend/src/main/resources/static/images/cards/easttradingpost.png
diff --git a/src/main/resources/static/images/cards/excavation.png b/backend/src/main/resources/static/images/cards/excavation.png
index 0fe1b01f..0fe1b01f 100644
--- a/src/main/resources/static/images/cards/excavation.png
+++ b/backend/src/main/resources/static/images/cards/excavation.png
diff --git a/src/main/resources/static/images/cards/forestcave.png b/backend/src/main/resources/static/images/cards/forestcave.png
index 262fffc6..262fffc6 100644
--- a/src/main/resources/static/images/cards/forestcave.png
+++ b/backend/src/main/resources/static/images/cards/forestcave.png
diff --git a/src/main/resources/static/images/cards/fortifications.png b/backend/src/main/resources/static/images/cards/fortifications.png
index 3e113473..3e113473 100644
--- a/src/main/resources/static/images/cards/fortifications.png
+++ b/backend/src/main/resources/static/images/cards/fortifications.png
diff --git a/src/main/resources/static/images/cards/forum.png b/backend/src/main/resources/static/images/cards/forum.png
index d6262158..d6262158 100644
--- a/src/main/resources/static/images/cards/forum.png
+++ b/backend/src/main/resources/static/images/cards/forum.png
diff --git a/src/main/resources/static/images/cards/foundry.png b/backend/src/main/resources/static/images/cards/foundry.png
index da95a48e..da95a48e 100644
--- a/src/main/resources/static/images/cards/foundry.png
+++ b/backend/src/main/resources/static/images/cards/foundry.png
diff --git a/src/main/resources/static/images/cards/gardens.png b/backend/src/main/resources/static/images/cards/gardens.png
index 9a49a0ad..9a49a0ad 100644
--- a/src/main/resources/static/images/cards/gardens.png
+++ b/backend/src/main/resources/static/images/cards/gardens.png
diff --git a/src/main/resources/static/images/cards/glassworks.png b/backend/src/main/resources/static/images/cards/glassworks.png
index 285d7d54..285d7d54 100644
--- a/src/main/resources/static/images/cards/glassworks.png
+++ b/backend/src/main/resources/static/images/cards/glassworks.png
diff --git a/src/main/resources/static/images/cards/guardtower.png b/backend/src/main/resources/static/images/cards/guardtower.png
index 524b06f3..524b06f3 100644
--- a/src/main/resources/static/images/cards/guardtower.png
+++ b/backend/src/main/resources/static/images/cards/guardtower.png
diff --git a/src/main/resources/static/images/cards/haven.png b/backend/src/main/resources/static/images/cards/haven.png
index e0b345b2..e0b345b2 100644
--- a/src/main/resources/static/images/cards/haven.png
+++ b/backend/src/main/resources/static/images/cards/haven.png
diff --git a/src/main/resources/static/images/cards/laboratory.png b/backend/src/main/resources/static/images/cards/laboratory.png
index 4c29e81f..4c29e81f 100644
--- a/src/main/resources/static/images/cards/laboratory.png
+++ b/backend/src/main/resources/static/images/cards/laboratory.png
diff --git a/src/main/resources/static/images/cards/library.png b/backend/src/main/resources/static/images/cards/library.png
index 7495a2ca..7495a2ca 100644
--- a/src/main/resources/static/images/cards/library.png
+++ b/backend/src/main/resources/static/images/cards/library.png
diff --git a/src/main/resources/static/images/cards/lighthouse.png b/backend/src/main/resources/static/images/cards/lighthouse.png
index 2124811b..2124811b 100644
--- a/src/main/resources/static/images/cards/lighthouse.png
+++ b/backend/src/main/resources/static/images/cards/lighthouse.png
diff --git a/src/main/resources/static/images/cards/lodge.png b/backend/src/main/resources/static/images/cards/lodge.png
index 22758688..22758688 100644
--- a/src/main/resources/static/images/cards/lodge.png
+++ b/backend/src/main/resources/static/images/cards/lodge.png
diff --git a/src/main/resources/static/images/cards/loom.png b/backend/src/main/resources/static/images/cards/loom.png
index 70bdf375..70bdf375 100644
--- a/src/main/resources/static/images/cards/loom.png
+++ b/backend/src/main/resources/static/images/cards/loom.png
diff --git a/src/main/resources/static/images/cards/lumberyard.png b/backend/src/main/resources/static/images/cards/lumberyard.png
index 8558af1a..8558af1a 100644
--- a/src/main/resources/static/images/cards/lumberyard.png
+++ b/backend/src/main/resources/static/images/cards/lumberyard.png
diff --git a/src/main/resources/static/images/cards/magistratesguild.png b/backend/src/main/resources/static/images/cards/magistratesguild.png
index d7deabb3..d7deabb3 100644
--- a/src/main/resources/static/images/cards/magistratesguild.png
+++ b/backend/src/main/resources/static/images/cards/magistratesguild.png
diff --git a/src/main/resources/static/images/cards/marketplace.png b/backend/src/main/resources/static/images/cards/marketplace.png
index cd3676d4..cd3676d4 100644
--- a/src/main/resources/static/images/cards/marketplace.png
+++ b/backend/src/main/resources/static/images/cards/marketplace.png
diff --git a/src/main/resources/static/images/cards/mine.png b/backend/src/main/resources/static/images/cards/mine.png
index 4062775c..4062775c 100644
--- a/src/main/resources/static/images/cards/mine.png
+++ b/backend/src/main/resources/static/images/cards/mine.png
diff --git a/src/main/resources/static/images/cards/observatory.png b/backend/src/main/resources/static/images/cards/observatory.png
index 1da3d7b4..1da3d7b4 100644
--- a/src/main/resources/static/images/cards/observatory.png
+++ b/backend/src/main/resources/static/images/cards/observatory.png
diff --git a/src/main/resources/static/images/cards/orevein.png b/backend/src/main/resources/static/images/cards/orevein.png
index fabea674..fabea674 100644
--- a/src/main/resources/static/images/cards/orevein.png
+++ b/backend/src/main/resources/static/images/cards/orevein.png
diff --git a/src/main/resources/static/images/cards/palace.png b/backend/src/main/resources/static/images/cards/palace.png
index 1a24890e..1a24890e 100644
--- a/src/main/resources/static/images/cards/palace.png
+++ b/backend/src/main/resources/static/images/cards/palace.png
diff --git a/src/main/resources/static/images/cards/pantheon.png b/backend/src/main/resources/static/images/cards/pantheon.png
index 264bae02..264bae02 100644
--- a/src/main/resources/static/images/cards/pantheon.png
+++ b/backend/src/main/resources/static/images/cards/pantheon.png
diff --git a/src/main/resources/static/images/cards/pawnshop.png b/backend/src/main/resources/static/images/cards/pawnshop.png
index 30bb3807..30bb3807 100644
--- a/src/main/resources/static/images/cards/pawnshop.png
+++ b/backend/src/main/resources/static/images/cards/pawnshop.png
diff --git a/src/main/resources/static/images/cards/philosophersguild.png b/backend/src/main/resources/static/images/cards/philosophersguild.png
index f72590f6..f72590f6 100644
--- a/src/main/resources/static/images/cards/philosophersguild.png
+++ b/backend/src/main/resources/static/images/cards/philosophersguild.png
diff --git a/src/main/resources/static/images/cards/press.png b/backend/src/main/resources/static/images/cards/press.png
index c932df06..c932df06 100644
--- a/src/main/resources/static/images/cards/press.png
+++ b/backend/src/main/resources/static/images/cards/press.png
diff --git a/src/main/resources/static/images/cards/quarry.png b/backend/src/main/resources/static/images/cards/quarry.png
index 8cdbdb22..8cdbdb22 100644
--- a/src/main/resources/static/images/cards/quarry.png
+++ b/backend/src/main/resources/static/images/cards/quarry.png
diff --git a/src/main/resources/static/images/cards/sawmill.png b/backend/src/main/resources/static/images/cards/sawmill.png
index 5abff473..5abff473 100644
--- a/src/main/resources/static/images/cards/sawmill.png
+++ b/backend/src/main/resources/static/images/cards/sawmill.png
diff --git a/src/main/resources/static/images/cards/school.png b/backend/src/main/resources/static/images/cards/school.png
index ab2218d0..ab2218d0 100644
--- a/src/main/resources/static/images/cards/school.png
+++ b/backend/src/main/resources/static/images/cards/school.png
diff --git a/src/main/resources/static/images/cards/scientistsguild.png b/backend/src/main/resources/static/images/cards/scientistsguild.png
index 7ee639e3..7ee639e3 100644
--- a/src/main/resources/static/images/cards/scientistsguild.png
+++ b/backend/src/main/resources/static/images/cards/scientistsguild.png
diff --git a/src/main/resources/static/images/cards/scriptorium.png b/backend/src/main/resources/static/images/cards/scriptorium.png
index 36dca27a..36dca27a 100644
--- a/src/main/resources/static/images/cards/scriptorium.png
+++ b/backend/src/main/resources/static/images/cards/scriptorium.png
diff --git a/src/main/resources/static/images/cards/senate.png b/backend/src/main/resources/static/images/cards/senate.png
index ee878ea6..ee878ea6 100644
--- a/src/main/resources/static/images/cards/senate.png
+++ b/backend/src/main/resources/static/images/cards/senate.png
diff --git a/src/main/resources/static/images/cards/shipownersguild.png b/backend/src/main/resources/static/images/cards/shipownersguild.png
index 3eecd2da..3eecd2da 100644
--- a/src/main/resources/static/images/cards/shipownersguild.png
+++ b/backend/src/main/resources/static/images/cards/shipownersguild.png
diff --git a/src/main/resources/static/images/cards/siegeworkshop.png b/backend/src/main/resources/static/images/cards/siegeworkshop.png
index bacf8309..bacf8309 100644
--- a/src/main/resources/static/images/cards/siegeworkshop.png
+++ b/backend/src/main/resources/static/images/cards/siegeworkshop.png
diff --git a/src/main/resources/static/images/cards/spiesguild.png b/backend/src/main/resources/static/images/cards/spiesguild.png
index 85e28d9e..85e28d9e 100644
--- a/src/main/resources/static/images/cards/spiesguild.png
+++ b/backend/src/main/resources/static/images/cards/spiesguild.png
diff --git a/src/main/resources/static/images/cards/stables.png b/backend/src/main/resources/static/images/cards/stables.png
index 48c963f0..48c963f0 100644
--- a/src/main/resources/static/images/cards/stables.png
+++ b/backend/src/main/resources/static/images/cards/stables.png
diff --git a/src/main/resources/static/images/cards/statue.png b/backend/src/main/resources/static/images/cards/statue.png
index 55aaa5cb..55aaa5cb 100644
--- a/src/main/resources/static/images/cards/statue.png
+++ b/backend/src/main/resources/static/images/cards/statue.png
diff --git a/src/main/resources/static/images/cards/stockade.png b/backend/src/main/resources/static/images/cards/stockade.png
index 37741429..37741429 100644
--- a/src/main/resources/static/images/cards/stockade.png
+++ b/backend/src/main/resources/static/images/cards/stockade.png
diff --git a/src/main/resources/static/images/cards/stonepit.png b/backend/src/main/resources/static/images/cards/stonepit.png
index 724900c7..724900c7 100644
--- a/src/main/resources/static/images/cards/stonepit.png
+++ b/backend/src/main/resources/static/images/cards/stonepit.png
diff --git a/src/main/resources/static/images/cards/strategistsguild.png b/backend/src/main/resources/static/images/cards/strategistsguild.png
index ae186a4b..ae186a4b 100644
--- a/src/main/resources/static/images/cards/strategistsguild.png
+++ b/backend/src/main/resources/static/images/cards/strategistsguild.png
diff --git a/src/main/resources/static/images/cards/study.png b/backend/src/main/resources/static/images/cards/study.png
index d8b9ebf9..d8b9ebf9 100644
--- a/src/main/resources/static/images/cards/study.png
+++ b/backend/src/main/resources/static/images/cards/study.png
diff --git a/src/main/resources/static/images/cards/tavern.png b/backend/src/main/resources/static/images/cards/tavern.png
index 418b0fb2..418b0fb2 100644
--- a/src/main/resources/static/images/cards/tavern.png
+++ b/backend/src/main/resources/static/images/cards/tavern.png
diff --git a/src/main/resources/static/images/cards/temple.png b/backend/src/main/resources/static/images/cards/temple.png
index 9a8d89dc..9a8d89dc 100644
--- a/src/main/resources/static/images/cards/temple.png
+++ b/backend/src/main/resources/static/images/cards/temple.png
diff --git a/src/main/resources/static/images/cards/theater.png b/backend/src/main/resources/static/images/cards/theater.png
index 0d5b2b01..0d5b2b01 100644
--- a/src/main/resources/static/images/cards/theater.png
+++ b/backend/src/main/resources/static/images/cards/theater.png
diff --git a/src/main/resources/static/images/cards/timberyard.png b/backend/src/main/resources/static/images/cards/timberyard.png
index 0f20547f..0f20547f 100644
--- a/src/main/resources/static/images/cards/timberyard.png
+++ b/backend/src/main/resources/static/images/cards/timberyard.png
diff --git a/src/main/resources/static/images/cards/townhall.png b/backend/src/main/resources/static/images/cards/townhall.png
index d0638739..d0638739 100644
--- a/src/main/resources/static/images/cards/townhall.png
+++ b/backend/src/main/resources/static/images/cards/townhall.png
diff --git a/src/main/resources/static/images/cards/tradersguild.png b/backend/src/main/resources/static/images/cards/tradersguild.png
index 15777e77..15777e77 100644
--- a/src/main/resources/static/images/cards/tradersguild.png
+++ b/backend/src/main/resources/static/images/cards/tradersguild.png
diff --git a/src/main/resources/static/images/cards/trainingground.png b/backend/src/main/resources/static/images/cards/trainingground.png
index d59ef4f8..d59ef4f8 100644
--- a/src/main/resources/static/images/cards/trainingground.png
+++ b/backend/src/main/resources/static/images/cards/trainingground.png
diff --git a/src/main/resources/static/images/cards/treefarm.png b/backend/src/main/resources/static/images/cards/treefarm.png
index 18cf228f..18cf228f 100644
--- a/src/main/resources/static/images/cards/treefarm.png
+++ b/backend/src/main/resources/static/images/cards/treefarm.png
diff --git a/src/main/resources/static/images/cards/university.png b/backend/src/main/resources/static/images/cards/university.png
index c9ca8a80..c9ca8a80 100644
--- a/src/main/resources/static/images/cards/university.png
+++ b/backend/src/main/resources/static/images/cards/university.png
diff --git a/src/main/resources/static/images/cards/vineyard.png b/backend/src/main/resources/static/images/cards/vineyard.png
index 58fa8ee1..58fa8ee1 100644
--- a/src/main/resources/static/images/cards/vineyard.png
+++ b/backend/src/main/resources/static/images/cards/vineyard.png
diff --git a/src/main/resources/static/images/cards/walls.png b/backend/src/main/resources/static/images/cards/walls.png
index 3823c62f..3823c62f 100644
--- a/src/main/resources/static/images/cards/walls.png
+++ b/backend/src/main/resources/static/images/cards/walls.png
diff --git a/src/main/resources/static/images/cards/westtradingpost.png b/backend/src/main/resources/static/images/cards/westtradingpost.png
index b536269f..b536269f 100644
--- a/src/main/resources/static/images/cards/westtradingpost.png
+++ b/backend/src/main/resources/static/images/cards/westtradingpost.png
diff --git a/src/main/resources/static/images/cards/workersguild.png b/backend/src/main/resources/static/images/cards/workersguild.png
index de4f452f..de4f452f 100644
--- a/src/main/resources/static/images/cards/workersguild.png
+++ b/backend/src/main/resources/static/images/cards/workersguild.png
diff --git a/src/main/resources/static/images/cards/workshop.png b/backend/src/main/resources/static/images/cards/workshop.png
index 8f585d61..8f585d61 100644
--- a/src/main/resources/static/images/cards/workshop.png
+++ b/backend/src/main/resources/static/images/cards/workshop.png
diff --git a/src/main/resources/static/images/tokens/buy.png b/backend/src/main/resources/static/images/tokens/buy.png
index 07af65a3..07af65a3 100644
--- a/src/main/resources/static/images/tokens/buy.png
+++ b/backend/src/main/resources/static/images/tokens/buy.png
diff --git a/src/main/resources/static/images/tokens/card.png b/backend/src/main/resources/static/images/tokens/card.png
index fcdbc068..fcdbc068 100644
--- a/src/main/resources/static/images/tokens/card.png
+++ b/backend/src/main/resources/static/images/tokens/card.png
diff --git a/src/main/resources/static/images/tokens/check.png b/backend/src/main/resources/static/images/tokens/check.png
index 98db5be0..98db5be0 100644
--- a/src/main/resources/static/images/tokens/check.png
+++ b/backend/src/main/resources/static/images/tokens/check.png
diff --git a/src/main/resources/static/images/tokens/clay.png b/backend/src/main/resources/static/images/tokens/clay.png
index 72fc0b0e..72fc0b0e 100644
--- a/src/main/resources/static/images/tokens/clay.png
+++ b/backend/src/main/resources/static/images/tokens/clay.png
diff --git a/src/main/resources/static/images/tokens/coin.png b/backend/src/main/resources/static/images/tokens/coin.png
index f4813042..f4813042 100644
--- a/src/main/resources/static/images/tokens/coin.png
+++ b/backend/src/main/resources/static/images/tokens/coin.png
diff --git a/src/main/resources/static/images/tokens/coin1.png b/backend/src/main/resources/static/images/tokens/coin1.png
index dd57e5f0..dd57e5f0 100644
--- a/src/main/resources/static/images/tokens/coin1.png
+++ b/backend/src/main/resources/static/images/tokens/coin1.png
diff --git a/src/main/resources/static/images/tokens/coin3.png b/backend/src/main/resources/static/images/tokens/coin3.png
index 546d41b6..546d41b6 100644
--- a/src/main/resources/static/images/tokens/coin3.png
+++ b/backend/src/main/resources/static/images/tokens/coin3.png
diff --git a/src/main/resources/static/images/tokens/free.png b/backend/src/main/resources/static/images/tokens/free.png
index 1c8d0782..1c8d0782 100644
--- a/src/main/resources/static/images/tokens/free.png
+++ b/backend/src/main/resources/static/images/tokens/free.png
diff --git a/src/main/resources/static/images/tokens/glass.png b/backend/src/main/resources/static/images/tokens/glass.png
index 61fd2be5..61fd2be5 100644
--- a/src/main/resources/static/images/tokens/glass.png
+++ b/backend/src/main/resources/static/images/tokens/glass.png
diff --git a/src/main/resources/static/images/tokens/linen.png b/backend/src/main/resources/static/images/tokens/linen.png
index 294adcb2..294adcb2 100644
--- a/src/main/resources/static/images/tokens/linen.png
+++ b/backend/src/main/resources/static/images/tokens/linen.png
diff --git a/src/main/resources/static/images/tokens/no.png b/backend/src/main/resources/static/images/tokens/no.png
index 78d09fea..78d09fea 100644
--- a/src/main/resources/static/images/tokens/no.png
+++ b/backend/src/main/resources/static/images/tokens/no.png
diff --git a/src/main/resources/static/images/tokens/ore.png b/backend/src/main/resources/static/images/tokens/ore.png
index c2149daa..c2149daa 100644
--- a/src/main/resources/static/images/tokens/ore.png
+++ b/backend/src/main/resources/static/images/tokens/ore.png
diff --git a/src/main/resources/static/images/tokens/paper.png b/backend/src/main/resources/static/images/tokens/paper.png
index 91a59221..91a59221 100644
--- a/src/main/resources/static/images/tokens/paper.png
+++ b/backend/src/main/resources/static/images/tokens/paper.png
diff --git a/src/main/resources/static/images/tokens/pyramid-stage0.png b/backend/src/main/resources/static/images/tokens/pyramid-stage0.png
index b6a3977f..b6a3977f 100644
--- a/src/main/resources/static/images/tokens/pyramid-stage0.png
+++ b/backend/src/main/resources/static/images/tokens/pyramid-stage0.png
diff --git a/src/main/resources/static/images/tokens/pyramid-stage1.png b/backend/src/main/resources/static/images/tokens/pyramid-stage1.png
index ead4a34e..ead4a34e 100644
--- a/src/main/resources/static/images/tokens/pyramid-stage1.png
+++ b/backend/src/main/resources/static/images/tokens/pyramid-stage1.png
diff --git a/src/main/resources/static/images/tokens/pyramid-stage2.png b/backend/src/main/resources/static/images/tokens/pyramid-stage2.png
index 7239a3a4..7239a3a4 100644
--- a/src/main/resources/static/images/tokens/pyramid-stage2.png
+++ b/backend/src/main/resources/static/images/tokens/pyramid-stage2.png
diff --git a/src/main/resources/static/images/tokens/pyramid-stage3.png b/backend/src/main/resources/static/images/tokens/pyramid-stage3.png
index cab9912b..cab9912b 100644
--- a/src/main/resources/static/images/tokens/pyramid-stage3.png
+++ b/backend/src/main/resources/static/images/tokens/pyramid-stage3.png
diff --git a/src/main/resources/static/images/tokens/pyramid.png b/backend/src/main/resources/static/images/tokens/pyramid.png
index 074247da..074247da 100644
--- a/src/main/resources/static/images/tokens/pyramid.png
+++ b/backend/src/main/resources/static/images/tokens/pyramid.png
diff --git a/src/main/resources/static/images/tokens/stone.png b/backend/src/main/resources/static/images/tokens/stone.png
index 674c40db..674c40db 100644
--- a/src/main/resources/static/images/tokens/stone.png
+++ b/backend/src/main/resources/static/images/tokens/stone.png
diff --git a/src/main/resources/static/images/tokens/trash.png b/backend/src/main/resources/static/images/tokens/trash.png
index 086df817..086df817 100644
--- a/src/main/resources/static/images/tokens/trash.png
+++ b/backend/src/main/resources/static/images/tokens/trash.png
diff --git a/src/main/resources/static/images/tokens/victory1.png b/backend/src/main/resources/static/images/tokens/victory1.png
index 6b9aff29..6b9aff29 100644
--- a/src/main/resources/static/images/tokens/victory1.png
+++ b/backend/src/main/resources/static/images/tokens/victory1.png
diff --git a/src/main/resources/static/images/tokens/victory3.png b/backend/src/main/resources/static/images/tokens/victory3.png
index 474cb30c..474cb30c 100644
--- a/src/main/resources/static/images/tokens/victory3.png
+++ b/backend/src/main/resources/static/images/tokens/victory3.png
diff --git a/src/main/resources/static/images/tokens/victory5.png b/backend/src/main/resources/static/images/tokens/victory5.png
index ad042119..ad042119 100644
--- a/src/main/resources/static/images/tokens/victory5.png
+++ b/backend/src/main/resources/static/images/tokens/victory5.png
diff --git a/src/main/resources/static/images/tokens/victoryminus1.png b/backend/src/main/resources/static/images/tokens/victoryminus1.png
index 00a615c7..00a615c7 100644
--- a/src/main/resources/static/images/tokens/victoryminus1.png
+++ b/backend/src/main/resources/static/images/tokens/victoryminus1.png
diff --git a/src/main/resources/static/images/tokens/wood.png b/backend/src/main/resources/static/images/tokens/wood.png
index 09a4ede8..09a4ede8 100644
--- a/src/main/resources/static/images/tokens/wood.png
+++ b/backend/src/main/resources/static/images/tokens/wood.png
diff --git a/src/main/resources/static/images/wonders/alexandriaA.png b/backend/src/main/resources/static/images/wonders/alexandriaA.png
index 416d534e..416d534e 100644
--- a/src/main/resources/static/images/wonders/alexandriaA.png
+++ b/backend/src/main/resources/static/images/wonders/alexandriaA.png
diff --git a/src/main/resources/static/images/wonders/alexandriaB.png b/backend/src/main/resources/static/images/wonders/alexandriaB.png
index 205a5256..205a5256 100644
--- a/src/main/resources/static/images/wonders/alexandriaB.png
+++ b/backend/src/main/resources/static/images/wonders/alexandriaB.png
diff --git a/src/main/resources/static/images/wonders/babylonA.png b/backend/src/main/resources/static/images/wonders/babylonA.png
index f8e3725e..f8e3725e 100644
--- a/src/main/resources/static/images/wonders/babylonA.png
+++ b/backend/src/main/resources/static/images/wonders/babylonA.png
diff --git a/src/main/resources/static/images/wonders/babylonB.png b/backend/src/main/resources/static/images/wonders/babylonB.png
index 53f6f045..53f6f045 100644
--- a/src/main/resources/static/images/wonders/babylonB.png
+++ b/backend/src/main/resources/static/images/wonders/babylonB.png
diff --git a/src/main/resources/static/images/wonders/ephesosA.png b/backend/src/main/resources/static/images/wonders/ephesosA.png
index 285c8edf..285c8edf 100644
--- a/src/main/resources/static/images/wonders/ephesosA.png
+++ b/backend/src/main/resources/static/images/wonders/ephesosA.png
diff --git a/src/main/resources/static/images/wonders/ephesosB.png b/backend/src/main/resources/static/images/wonders/ephesosB.png
index 1e0e2541..1e0e2541 100644
--- a/src/main/resources/static/images/wonders/ephesosB.png
+++ b/backend/src/main/resources/static/images/wonders/ephesosB.png
diff --git a/src/main/resources/static/images/wonders/extra/agrigentoA.jpg b/backend/src/main/resources/static/images/wonders/extra/agrigentoA.jpg
index 76ba8195..76ba8195 100644
--- a/src/main/resources/static/images/wonders/extra/agrigentoA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/agrigentoA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/angkorwatA.jpg b/backend/src/main/resources/static/images/wonders/extra/angkorwatA.jpg
index 32f52514..32f52514 100644
--- a/src/main/resources/static/images/wonders/extra/angkorwatA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/angkorwatA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/angkorwatB.jpg b/backend/src/main/resources/static/images/wonders/extra/angkorwatB.jpg
index c3f4304e..c3f4304e 100644
--- a/src/main/resources/static/images/wonders/extra/angkorwatB.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/angkorwatB.jpg
diff --git a/src/main/resources/static/images/wonders/extra/avalonA.jpg b/backend/src/main/resources/static/images/wonders/extra/avalonA.jpg
index 7f7f0678..7f7f0678 100644
--- a/src/main/resources/static/images/wonders/extra/avalonA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/avalonA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/ctesiphonB.jpg b/backend/src/main/resources/static/images/wonders/extra/ctesiphonB.jpg
index c00b40ac..c00b40ac 100644
--- a/src/main/resources/static/images/wonders/extra/ctesiphonB.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/ctesiphonB.jpg
diff --git a/src/main/resources/static/images/wonders/extra/iramA.jpg b/backend/src/main/resources/static/images/wonders/extra/iramA.jpg
index d2c24e95..d2c24e95 100644
--- a/src/main/resources/static/images/wonders/extra/iramA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/iramA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/persepolisA.jpg b/backend/src/main/resources/static/images/wonders/extra/persepolisA.jpg
index 2caa4f89..2caa4f89 100644
--- a/src/main/resources/static/images/wonders/extra/persepolisA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/persepolisA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/romaA.jpg b/backend/src/main/resources/static/images/wonders/extra/romaA.jpg
index c54bc820..c54bc820 100644
--- a/src/main/resources/static/images/wonders/extra/romaA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/romaA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/sangri-laA.jpg b/backend/src/main/resources/static/images/wonders/extra/sangri-laA.jpg
index 1c5dad97..1c5dad97 100644
--- a/src/main/resources/static/images/wonders/extra/sangri-laA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/sangri-laA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/spahanA.jpg b/backend/src/main/resources/static/images/wonders/extra/spahanA.jpg
index ab2cfc84..ab2cfc84 100644
--- a/src/main/resources/static/images/wonders/extra/spahanA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/spahanA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/the-great-wallA.jpg b/backend/src/main/resources/static/images/wonders/extra/the-great-wallA.jpg
index 4aacd39b..4aacd39b 100644
--- a/src/main/resources/static/images/wonders/extra/the-great-wallA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/the-great-wallA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/veniseA.jpg b/backend/src/main/resources/static/images/wonders/extra/veniseA.jpg
index 55ec00b5..55ec00b5 100644
--- a/src/main/resources/static/images/wonders/extra/veniseA.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/veniseA.jpg
diff --git a/src/main/resources/static/images/wonders/extra/veniseB.jpg b/backend/src/main/resources/static/images/wonders/extra/veniseB.jpg
index e18f3a12..e18f3a12 100644
--- a/src/main/resources/static/images/wonders/extra/veniseB.jpg
+++ b/backend/src/main/resources/static/images/wonders/extra/veniseB.jpg
diff --git a/src/main/resources/static/images/wonders/gizahA.png b/backend/src/main/resources/static/images/wonders/gizahA.png
index 5e755594..5e755594 100644
--- a/src/main/resources/static/images/wonders/gizahA.png
+++ b/backend/src/main/resources/static/images/wonders/gizahA.png
diff --git a/src/main/resources/static/images/wonders/gizahB.png b/backend/src/main/resources/static/images/wonders/gizahB.png
index 60b90fed..60b90fed 100644
--- a/src/main/resources/static/images/wonders/gizahB.png
+++ b/backend/src/main/resources/static/images/wonders/gizahB.png
diff --git a/src/main/resources/static/images/wonders/halikarnassusA.png b/backend/src/main/resources/static/images/wonders/halikarnassusA.png
index 5e6acc36..5e6acc36 100644
--- a/src/main/resources/static/images/wonders/halikarnassusA.png
+++ b/backend/src/main/resources/static/images/wonders/halikarnassusA.png
diff --git a/src/main/resources/static/images/wonders/halikarnassusB.png b/backend/src/main/resources/static/images/wonders/halikarnassusB.png
index 42d67786..42d67786 100644
--- a/src/main/resources/static/images/wonders/halikarnassusB.png
+++ b/backend/src/main/resources/static/images/wonders/halikarnassusB.png
diff --git a/src/main/resources/static/images/wonders/olympiaA.png b/backend/src/main/resources/static/images/wonders/olympiaA.png
index 315c090b..315c090b 100644
--- a/src/main/resources/static/images/wonders/olympiaA.png
+++ b/backend/src/main/resources/static/images/wonders/olympiaA.png
diff --git a/src/main/resources/static/images/wonders/olympiaB.png b/backend/src/main/resources/static/images/wonders/olympiaB.png
index a6c81af6..a6c81af6 100644
--- a/src/main/resources/static/images/wonders/olympiaB.png
+++ b/backend/src/main/resources/static/images/wonders/olympiaB.png
diff --git a/src/main/resources/static/images/wonders/rhodosA.png b/backend/src/main/resources/static/images/wonders/rhodosA.png
index 13ea69e1..13ea69e1 100644
--- a/src/main/resources/static/images/wonders/rhodosA.png
+++ b/backend/src/main/resources/static/images/wonders/rhodosA.png
diff --git a/src/main/resources/static/images/wonders/rhodosB.png b/backend/src/main/resources/static/images/wonders/rhodosB.png
index 2cfa4e18..2cfa4e18 100644
--- a/src/main/resources/static/images/wonders/rhodosB.png
+++ b/backend/src/main/resources/static/images/wonders/rhodosB.png
diff --git a/src/main/resources/static/index.html b/backend/src/main/resources/static/index.html
index d5ec178d..d5ec178d 100644
--- a/src/main/resources/static/index.html
+++ b/backend/src/main/resources/static/index.html
diff --git a/src/main/resources/static/test-ws.js b/backend/src/main/resources/static/test-ws.js
index 1c64349e..1c64349e 100644
--- a/src/main/resources/static/test-ws.js
+++ b/backend/src/main/resources/static/test-ws.js
diff --git a/src/main/resources/static/test.html b/backend/src/main/resources/static/test.html
index e19f9eb3..e19f9eb3 100644
--- a/src/main/resources/static/test.html
+++ b/backend/src/main/resources/static/test.html
diff --git a/src/test/java/org/luxons/sevenwonders/game/LobbyTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/LobbyTest.java
index 4a12592e..4a12592e 100644
--- a/src/test/java/org/luxons/sevenwonders/game/LobbyTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/LobbyTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/api/TableTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/api/TableTest.java
index 9ed0af02..9ed0af02 100644
--- a/src/test/java/org/luxons/sevenwonders/game/api/TableTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/api/TableTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/boards/BoardTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/boards/BoardTest.java
index f9117146..f9117146 100644
--- a/src/test/java/org/luxons/sevenwonders/game/boards/BoardTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/boards/BoardTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/boards/MilitaryTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/boards/MilitaryTest.java
index 7ef253db..7ef253db 100644
--- a/src/test/java/org/luxons/sevenwonders/game/boards/MilitaryTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/boards/MilitaryTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.java
index e95a1e37..e95a1e37 100644
--- a/src/test/java/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/boards/RelativeBoardPositionTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/boards/ScienceTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/boards/ScienceTest.java
index 067a7eff..067a7eff 100644
--- a/src/test/java/org/luxons/sevenwonders/game/boards/ScienceTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/boards/ScienceTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/cards/CardBackTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/cards/CardBackTest.java
index d105c33f..d105c33f 100644
--- a/src/test/java/org/luxons/sevenwonders/game/cards/CardBackTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/cards/CardBackTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/cards/CardTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/cards/CardTest.java
index 4a481442..4a481442 100644
--- a/src/test/java/org/luxons/sevenwonders/game/cards/CardTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/cards/CardTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/cards/DecksTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/cards/DecksTest.java
index 06060f16..06060f16 100644
--- a/src/test/java/org/luxons/sevenwonders/game/cards/DecksTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/cards/DecksTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.java
index 6165d158..6165d158 100644
--- a/src/test/java/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/cards/HandRotationDirectionTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/cards/HandsTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/cards/HandsTest.java
index 494b9e4c..494b9e4c 100644
--- a/src/test/java/org/luxons/sevenwonders/game/cards/HandsTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/cards/HandsTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.java
index b38afd49..b38afd49 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionLoaderTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionTest.java
index 5acc09df..5acc09df 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/GameDefinitionTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.java
index 2544ca64..2544ca64 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/definitions/WonderSidePickMethodTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.java
index 753a26cf..753a26cf 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/NumericEffectSerializerTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.java
index 17940361..17940361 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ProductionIncreaseSerializerTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.java
index 86f3f5ab..86f3f5ab 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypeSerializerTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.java
index 4ebbc33f..4ebbc33f 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourceTypesSerializerTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.java
index 1fd01337..1fd01337 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ResourcesSerializerTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.java
index 40088fda..40088fda 100644
--- a/src/test/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/data/serializers/ScienceProgressSerializerTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.java
index 5f42bc53..5f42bc53 100644
--- a/src/test/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/effects/BonusPerBoardElementTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/effects/DiscountTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/effects/DiscountTest.java
index cf8ce21d..cf8ce21d 100644
--- a/src/test/java/org/luxons/sevenwonders/game/effects/DiscountTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/effects/DiscountTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.java
index e4d4c27f..e4d4c27f 100644
--- a/src/test/java/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/effects/GoldIncreaseTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.java
index d3c2cc03..d3c2cc03 100644
--- a/src/test/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/effects/MilitaryReinforcementsTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.java
index 6031e112..6031e112 100644
--- a/src/test/java/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/effects/ProductionIncreaseTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.java
index a1c8a8de..a1c8a8de 100644
--- a/src/test/java/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/effects/RawPointsIncreaseTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/effects/ScienceProgressTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/effects/ScienceProgressTest.java
index 56289654..56289654 100644
--- a/src/test/java/org/luxons/sevenwonders/game/effects/ScienceProgressTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/effects/ScienceProgressTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.java
index b04db127..b04db127 100644
--- a/src/test/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/effects/SpecialAbilityActivationTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/resources/ProductionTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/resources/ProductionTest.java
index 76d2345f..76d2345f 100644
--- a/src/test/java/org/luxons/sevenwonders/game/resources/ProductionTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/resources/ProductionTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/resources/ResourcesTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/resources/ResourcesTest.java
index 674c90e7..674c90e7 100644
--- a/src/test/java/org/luxons/sevenwonders/game/resources/ResourcesTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/resources/ResourcesTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/resources/TradingRulesTest.java b/backend/src/test/java/org/luxons/sevenwonders/game/resources/TradingRulesTest.java
index cd6661dc..cd6661dc 100644
--- a/src/test/java/org/luxons/sevenwonders/game/resources/TradingRulesTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/resources/TradingRulesTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/game/test/TestUtils.java b/backend/src/test/java/org/luxons/sevenwonders/game/test/TestUtils.java
index b5ddb7b1..b5ddb7b1 100644
--- a/src/test/java/org/luxons/sevenwonders/game/test/TestUtils.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/game/test/TestUtils.java
diff --git a/src/test/java/org/luxons/sevenwonders/repositories/GameRepositoryTest.java b/backend/src/test/java/org/luxons/sevenwonders/repositories/GameRepositoryTest.java
index 5d7d558b..5d7d558b 100644
--- a/src/test/java/org/luxons/sevenwonders/repositories/GameRepositoryTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/repositories/GameRepositoryTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.java b/backend/src/test/java/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.java
index f5a8d800..f5a8d800 100644
--- a/src/test/java/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/repositories/LobbyRepositoryTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/repositories/PlayerRepositoryTest.java b/backend/src/test/java/org/luxons/sevenwonders/repositories/PlayerRepositoryTest.java
index d9e07b3f..d9e07b3f 100644
--- a/src/test/java/org/luxons/sevenwonders/repositories/PlayerRepositoryTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/repositories/PlayerRepositoryTest.java
diff --git a/src/test/java/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.java b/backend/src/test/java/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.java
index 1a799ff3..1a799ff3 100644
--- a/src/test/java/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.java
+++ b/backend/src/test/java/org/luxons/sevenwonders/validation/DestinationAccessValidatorTest.java
diff --git a/src/main/js/.editorconfig b/frontend/.editorconfig
index 32c3b3d4..32c3b3d4 100644
--- a/src/main/js/.editorconfig
+++ b/frontend/.editorconfig
diff --git a/src/main/js/.gitignore b/frontend/.gitignore
index 6c96c5cf..b85d5828 100644
--- a/src/main/js/.gitignore
+++ b/frontend/.gitignore
@@ -1,7 +1,7 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # dependencies
-node_modules
+../src/main/js/node_modules
 
 # testing
 coverage
diff --git a/src/main/js/README.md b/frontend/README.md
index bdb88df6..bdb88df6 100644
--- a/src/main/js/README.md
+++ b/frontend/README.md
diff --git a/frontend/build.gradle b/frontend/build.gradle
new file mode 100644
index 00000000..9be32934
--- /dev/null
+++ b/frontend/build.gradle
@@ -0,0 +1,34 @@
+plugins {
+    id "com.moowork.node" version "1.1.1"
+}
+
+apply plugin: 'base'
+
+version '0.0.1'
+buildDir = 'dist'
+
+node {
+    version = '6.9.4'
+    npmVersion = '4.1.1'
+    yarnVersion = '0.19.1'
+    download = true
+}
+
+task bundle(type: YarnTask) {
+    inputs.dir(new File('public'))
+    inputs.dir(new File('src'))
+    outputs.dir(new File('dist'))
+    args = ['run', 'build']
+}
+
+task start(type: NpmTask) {
+    args = ['start']
+}
+
+task test(type: NpmTask) {
+    args = ['test']
+}
+
+check.dependsOn(test)
+bundle.dependsOn(npm_install)
+assemble.dependsOn(bundle)
\ No newline at end of file
diff --git a/src/main/js/package.json b/frontend/package.json
index 34632161..34632161 100644
--- a/src/main/js/package.json
+++ b/frontend/package.json
diff --git a/src/main/js/public/favicon.ico b/frontend/public/favicon.ico
index 5c125de5..5c125de5 100644
--- a/src/main/js/public/favicon.ico
+++ b/frontend/public/favicon.ico
diff --git a/src/main/js/public/index.html b/frontend/public/index.html
index aab5e3b0..aab5e3b0 100644
--- a/src/main/js/public/index.html
+++ b/frontend/public/index.html
diff --git a/src/main/js/src/components/errors/Error404.js b/frontend/src/components/errors/Error404.js
index b657482d..b657482d 100644
--- a/src/main/js/src/components/errors/Error404.js
+++ b/frontend/src/components/errors/Error404.js
diff --git a/src/main/js/src/components/modals/username.js b/frontend/src/components/modals/username.js
index 61b52114..61b52114 100644
--- a/src/main/js/src/components/modals/username.js
+++ b/frontend/src/components/modals/username.js
diff --git a/src/main/js/src/containers/App/actions.js b/frontend/src/containers/App/actions.js
index cfb617d5..cfb617d5 100644
--- a/src/main/js/src/containers/App/actions.js
+++ b/frontend/src/containers/App/actions.js
diff --git a/src/main/js/src/containers/App/constants.js b/frontend/src/containers/App/constants.js
index be31f8cc..be31f8cc 100644
--- a/src/main/js/src/containers/App/constants.js
+++ b/frontend/src/containers/App/constants.js
diff --git a/src/main/js/src/containers/App/index.js b/frontend/src/containers/App/index.js
index 70f99b6b..70f99b6b 100644
--- a/src/main/js/src/containers/App/index.js
+++ b/frontend/src/containers/App/index.js
diff --git a/src/main/js/src/containers/App/saga.js b/frontend/src/containers/App/saga.js
index 0c212142..0c212142 100644
--- a/src/main/js/src/containers/App/saga.js
+++ b/frontend/src/containers/App/saga.js
diff --git a/src/main/js/src/containers/GameBrowser/actions.js b/frontend/src/containers/GameBrowser/actions.js
index 376973b4..376973b4 100644
--- a/src/main/js/src/containers/GameBrowser/actions.js
+++ b/frontend/src/containers/GameBrowser/actions.js
diff --git a/src/main/js/src/containers/GameBrowser/constants.js b/frontend/src/containers/GameBrowser/constants.js
index 36f701b7..36f701b7 100644
--- a/src/main/js/src/containers/GameBrowser/constants.js
+++ b/frontend/src/containers/GameBrowser/constants.js
diff --git a/src/main/js/src/containers/GameBrowser/index.js b/frontend/src/containers/GameBrowser/index.js
index 9deb720b..9deb720b 100644
--- a/src/main/js/src/containers/GameBrowser/index.js
+++ b/frontend/src/containers/GameBrowser/index.js
diff --git a/src/main/js/src/containers/GameBrowser/reducer.js b/frontend/src/containers/GameBrowser/reducer.js
index 4fb3390a..4fb3390a 100644
--- a/src/main/js/src/containers/GameBrowser/reducer.js
+++ b/frontend/src/containers/GameBrowser/reducer.js
diff --git a/src/main/js/src/containers/GameBrowser/saga.js b/frontend/src/containers/GameBrowser/saga.js
index 4cd3d207..4cd3d207 100644
--- a/src/main/js/src/containers/GameBrowser/saga.js
+++ b/frontend/src/containers/GameBrowser/saga.js
diff --git a/src/main/js/src/containers/HomePage/actions.js b/frontend/src/containers/HomePage/actions.js
index e06d6fa2..e06d6fa2 100644
--- a/src/main/js/src/containers/HomePage/actions.js
+++ b/frontend/src/containers/HomePage/actions.js
diff --git a/src/main/js/src/containers/HomePage/index.js b/frontend/src/containers/HomePage/index.js
index c8e33239..c8e33239 100644
--- a/src/main/js/src/containers/HomePage/index.js
+++ b/frontend/src/containers/HomePage/index.js
diff --git a/src/main/js/src/containers/HomePage/saga.js b/frontend/src/containers/HomePage/saga.js
index 0fbe8a45..0fbe8a45 100644
--- a/src/main/js/src/containers/HomePage/saga.js
+++ b/frontend/src/containers/HomePage/saga.js
diff --git a/src/main/js/src/containers/UserRepo/actions.js b/frontend/src/containers/UserRepo/actions.js
index dc06035b..dc06035b 100644
--- a/src/main/js/src/containers/UserRepo/actions.js
+++ b/frontend/src/containers/UserRepo/actions.js
diff --git a/src/main/js/src/containers/UserRepo/reducer.js b/frontend/src/containers/UserRepo/reducer.js
index 82960a58..82960a58 100644
--- a/src/main/js/src/containers/UserRepo/reducer.js
+++ b/frontend/src/containers/UserRepo/reducer.js
diff --git a/src/main/js/src/global-styles.css b/frontend/src/global-styles.css
index 4b644b66..4b644b66 100644
--- a/src/main/js/src/global-styles.css
+++ b/frontend/src/global-styles.css
diff --git a/src/main/js/src/index.js b/frontend/src/index.js
index 3edce222..3edce222 100644
--- a/src/main/js/src/index.js
+++ b/frontend/src/index.js
diff --git a/src/main/js/src/layouts/.gitkeep b/frontend/src/layouts/.gitkeep
index e69de29b..e69de29b 100644
--- a/src/main/js/src/layouts/.gitkeep
+++ b/frontend/src/layouts/.gitkeep
diff --git a/src/main/js/src/reducers.js b/frontend/src/reducers.js
index d9db899b..d9db899b 100644
--- a/src/main/js/src/reducers.js
+++ b/frontend/src/reducers.js
diff --git a/src/main/js/src/sagas.js b/frontend/src/sagas.js
index 58ef73ee..58ef73ee 100644
--- a/src/main/js/src/sagas.js
+++ b/frontend/src/sagas.js
diff --git a/src/main/js/src/store.js b/frontend/src/store.js
index e9ac401e..e9ac401e 100644
--- a/src/main/js/src/store.js
+++ b/frontend/src/store.js
diff --git a/src/main/js/src/utils/createWebSocketConnection.js b/frontend/src/utils/createWebSocketConnection.js
index b0924976..b0924976 100644
--- a/src/main/js/src/utils/createWebSocketConnection.js
+++ b/frontend/src/utils/createWebSocketConnection.js
diff --git a/src/main/js/yarn.lock b/frontend/yarn.lock
index cee03120..cee03120 100644
--- a/src/main/js/yarn.lock
+++ b/frontend/yarn.lock
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..aa4804f3
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+include 'frontend'
+include 'backend'
\ No newline at end of file