Implement phases 2 and 3 of joining algorithm
Merge branch 'master' of https://github.com/alist/stitch-server-mirror

Conflicts:
	model/stitch.coffee