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

Conflicts:
	core/src/com/cal/codeday/GameMenu.java
	core/src/com/cal/codeday/GameScreen.java
	core/src/com/cal/codeday/MainScreen.java
	core/src/com/cal/codeday/entity/tower/PresentShooter.java
	core/src/com/cal/codeday/entity/tower/Tower.java
Merge branch 'master' of https://www.github.com/TTSpaxxy/Codeday into dony

Conflicts:
	core/src/com/cal/codeday/GameMenu.java
	core/src/com/cal/codeday/GameScreen.java
	core/src/com/cal/codeday/MainScreen.java
	core/src/com/cal/codeday/entity/tower/PresentShooter.java
	core/src/com/cal/codeday/entity/tower/Tower.java
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