Should do the trick for now
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/specialattack/modjam/tileentity/TileEntityLight.java
Fix stuff