add appid for connection routing in server
Merge branch 'master' into collab

Conflicts:
	sync.coffee