no public
Merge remote-tracking branch 'origin/master'

Conflicts:
	examples/sample-service/src/main/groovy/io/advantageous/cognizance/example/SampleService.groovy
version