Add some blocks, fix some bugs
Merge remote-tracking branch 'origin/master'
Some stuffs
Merge remote-tracking branch 'origin/master'

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