cell layer
Adding some support stuff
Merge branch 'master' into socketio

Conflicts:
	test-scripts/create-simplenode-stateless.sh