修复多人协同编辑时，光标窜行的问题
Merge branch 'master' of github.com:fex-team/agroup

Conflicts:
	client/index.html
ignore bower_components
ignore .DS_Store