Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
升级kinetic后连线颜色问题
Merge branch 'merge' into dev
 Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

Conflicts:
	public/javascripts/index.coffee
	public/javascripts/index.js
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge
Merge branch 'merge' into dev
修改错误代码，提升性能
auto merge and fix confilct