Moar work
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/specialattack/modjam/client/render/TowerRenderer.java
	src/main/java/net/specialattack/modjam/client/render/timeentity/TileEntityTowerRenderer.java
	src/main/java/net/specialattack/modjam/packet/PacketHandler.java
	src/main/java/net/specialattack/modjam/tileentity/TileEntityTower.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/specialattack/modjam/blocks/BlockTower.java
	src/main/java/net/specialattack/modjam/client/ClientProxy.java