Merge origin/master

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