small
Continued on the Multiblock System. not yet tested.
Merge branch 'master' of github.com:ksmonkey123/ModJam

Conflicts:
	generic/ch/modjam/generic/multiblock/MultiBlockTileEntity.java
	generic/ch/modjam/generic/multiblock/Multiblock.java
	generic/ch/modjam/generic/multiblock/MultiblockHelper.java
	generic/ch/modjam/generic/multiblock/MultiblockRegistry.java
	trektech/ch/awae/trektech/TrekTech.java
merge fixes
yeah....