Merge branch 'maxime' of https://github.com/mbret/jenseits-von-theben into maxime

Conflicts:
	src/main/config/config.properties
	src/main/java/Interface/KnowledgeElement.java
	src/main/java/com/miage/cards/AssistantCard.java
	src/main/java/com/miage/cards/EthnologicalKnowledgeCard.java
	src/main/java/com/miage/cards/GeneralKnowledgeCard.java
	src/main/java/com/miage/game/Board.java
	src/main/java/com/miage/game/Deck.java
	src/main/java/com/miage/game/Player.java
	src/main/java/com/miage/main/Main.java
	src/main/java/com/miage/tokens/GeneralKnowledgeToken.java
	src/main/java/com/miage/tokens/SpecificKnowledgeToken.java
	src/test/java/com/miage/game/TestBoard.java