Merge origin/master

Conflicts:
	src/Building/Barracks/Barracks.java
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/Building/Barracks/Barracks.java