Merge branch 'master' of https://github.com/TTSpaxxy/Codeday

Conflicts:
	core/src/com/cal/codeday/GameMenu.java
	core/src/com/cal/codeday/entity/tower/Tower.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/cal/codeday/GameMenu.java