Gui Stuff
Merge branch 'master' of https://github.com/nicosio2/MineFluence

Conflicts:
	src/main/java/net/ocine/minefluence/blocks/MachineBlocks.java
	src/main/java/net/ocine/minefluence/blocks/tileentities/TileEntityOutput.java