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

Conflicts:
	public/javascripts/funcs.coffee
ecs slb 只有内网链接
Merge branch 'newui' of https://github.com/lln7777/zhuyun into dev

Conflicts:
	public/javascripts/funcs.coffee
Merge branch 'jack' of https://github.com/lln7777/zhuyun into merge
merge selectpicker问题
Merge branch 'merge' into dev
fix bug