fix
Merge branch 'xxx'

Conflicts:
	src/client.coffee
	src/server.coffee