Merge branch 'dynamic-namespaces' of https://github.com/markitx/socket.io into dynamic-namespace

Conflicts:
	lib/client.js
	test/socket.io.js