Make some fields private
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/specialattack/modjam/tileentity/TileEntityController.java
	src/net/specialattack/modjam/tileentity/TileEntityLight.java