Merge branch 'dev' of https://github.com/lvlx/zhuyun into backend
连线验证等
Merge branch 'backend' of https://github.com/lln7777/zhuyun into dev

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/index.coffee
	public/javascripts/index.js