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