code cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/demonmodders/questology/network/PacketSpikeUpdate.java
	src/main/java/demonmodders/questology/tileentities/TileEntitySpikes.java