Merge branch 'master' into gui

Conflicts:
	src/ArcherTower.java
	src/Defense.java
	src/GamePanel.java
	src/QuakeTower.java
	src/Structure.java