Merge branch 'master' of https://github.com/lorddusk/ModJam4 into alex

Conflicts:
	src/main/java/info/ppservers/ac/blocks/BlockHandler.java
no message
Dinnertime!
...aaand back
Phew...
Format
Sapling
Meh, I need a break, something isn't working
Merge branch 'alex' of github.com:lorddusk/ModJam4 into alex

Conflicts:
	src/main/java/info/ppservers/ac/AlchemicalCombination.java
	src/main/java/info/ppservers/ac/blocks/BlockHandler.java
	src/main/java/info/ppservers/ac/blocks/alchfurnace/ContainerAlchFurnace.java
	src/main/java/info/ppservers/ac/blocks/alchfurnace/GuiAlchFurnace.java
	src/main/java/info/ppservers/ac/blocks/alchfurnace/TileEntityAlchFurnace.java
	src/main/java/info/ppservers/ac/client/interfaces/GuiHandler.java
	src/main/java/info/ppservers/ac/crafting/AlchFurnaceRecipes.java
	src/main/java/info/ppservers/ac/world/ElementalTreeGen.java
Merge branch 'alex'