Updated to 0.9.6-SNAPSHOT as well as updated to new spock netkernel version
Merge branch 'master' of github.com:netkernelroc/layer1-java

Conflicts:
	urn.org.netkernelroc.layer1.java/gradle.properties