Merge origin/master

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

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

Conflicts:
	src/Building/Barracks/Barracks.java