fix
Merge branch 'ver1.1'

Conflicts:
	server.coffee