Merge branch 'feature-journal' into v2

Conflicts:
	ljdp/minechem/client/ClientProxy.java
	ljdp/minechem/common/CommonProxy.java
	ljdp/minechem/common/MinechemItems.java
	ljdp/minechem/common/ModMinechem.java
	ljdp/minechem/common/blocks/BlockSynthesis.java
	ljdp/minechem/common/recipe/MinechemRecipes.java