Turbine and manometer!
Merge branch 'master' of
https://github.com/tobiasvdp/industrialProcessing.git

Conflicts:
	src/minecraft/ip/industrialProcessing/client/ClientProxy.java
	src/minecraft/ip/industrialProcessing/config/ConfigMachineBlocks.java
	src/minecraft/ip/industrialProcessing/config/ConfigRenderers.java