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

...ny

Conflicts:
	core/src/com/cal/codeday/GameMenu.java
	core/src/com/cal/codeday/entity/tower/BottledEggnogLauncher.java
	core/src/com/cal/codeday/entity/tower/CandyShooter.java
	core/src/com/cal/codeday/entity/tower/ChristmasLightsShooter.java
	core/src/com/cal/codeday/entity/tower/ChristmasTreeMortar.java
	core/src/com/cal/codeday/entity/tower/PresentShooter.java
	core/src/com/cal/codeday/entity/tower/Tower.java