Fixed a few recipe issues
Fixed a few energy transfer issues
Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/common/tile/TileEntityEnergyCube.java