Merge origin/master

Conflicts:
	src/View/GameBoard.java
Merge origin/master

Conflicts:
	src/Unit/Villager/Villager.java
Merge origin/master

Conflicts:
	src/Unit/Villager/Villager.java
Merge origin/master

Conflicts:
	src/Unit/Villager/Villager.java