x
Merge branch 'master' of https://github.com/unbornchikken/workflow-4-node-examples
Merge branch 'master' of https://github.com/unbornchikken/workflow-4-node-examples

Conflicts:
	CorrelatedCalculator/WF4NodeCalculatorHost/wf/calculatorHost.js
conf
Merge branch 'master' of https://github.com/unbornchikken/workflow-4-node-examples

Conflicts:
	CorrelatedCalculator/CalculatorClient/App.config
app config
Merge branch 'master' of https://github.com/unbornchikken/workflow-4-node-examples