Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update
Add color for fluid item.

Conflicts:
	src/main/java/minechem/fluid/FluidHelper.java
	src/main/java/minechem/proxy/ClientProxy.java
	src/main/java/minechem/proxy/CommonProxy.java
Improved Minetweaker functionality
Merge pull request #301 from yushijinhun/fix-render

Add color for fluid item.
Merge pull request #303 from hilburn/1.7-update

Such Minetweaker, Many Decomposer, Wow
fixes nei rendering itemStacks on top of eachother
Merge pull request #304 from way2muchnoise/1.7-update

fixes nei rendering itemStacks on top of eachother
adds searchbar to chemist journal
Merge pull request #306 from way2muchnoise/1.7-update

adds searchbar to chemist journal
updated oreDict handlers, #305
Improved MT formatting a bit
Merge pull request #308 from way2muchnoise/1.7-update

updated oreDict handlers, #305
Merge pull request #309 from hilburn/1.7-update

Improved MT formatting a bit
Updated Decomposer MT to accept ItemStacks
Updated MT Synthesiser to accept Stacks
Fixed weird syntax derpiness

wasn't accepting arrays at the end of the function for some reason,
moving them to the first argument seems to fix this
Merge pull request #312 from hilburn/1.7-update

MT update to accept stacks of chemicals
MT Molecule
More MT Molecule