Adding JAM!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/dk/mrspring/kitchen/ClientProxy.java
	src/main/java/dk/mrspring/kitchen/Kitchen.java
	src/main/java/dk/mrspring/kitchen/KitchenBlocks.java
	src/main/java/dk/mrspring/kitchen/block/BlockBase.java
Adding JAM!