Merge branch 'dev' of https://github.com/lvlx/zhuyun into jack
新建架构配置
修正左边菜单样式
 Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

Conflicts:
	public/javascripts/index.js
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/index.js
Merge branch 'merge' into dev
Merge branch 'dev' of https://github.com/lvlx/zhuyun into jack
fix select bug
Merge branch 'fixbug' into dev
图标样式
调整属性配置UI
Merge branch 'fixui' into dev
调整样式
调整样式
图标样式、架构图片导出/预览
Merge branch 'dev' of https://github.com/lvlx/zhuyun into jack
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev
add feature
preview
Merge branch 'jack' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	views/index.ejs
	views/main.ejs