Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/specialattack/modjam/block/BlockLight.java
	src/net/specialattack/modjam/client/gui/GuiBasicController.java
	src/net/specialattack/modjam/client/gui/GuiChannelSlider.java
	src/net/specialattack/modjam/client/gui/GuiLight.java
	src/net/specialattack/modjam/item/ItemLens.java
	src/net/specialattack/modjam/tileentity/TileEntityController.java
	src/net/specialattack/modjam/tileentity/TileEntityLight.java