Merge branch 'dev' of https://github.com/lvlx/zhuyun into jack
Merge branch 'dev' of https://github.com/lvlx/zhuyun into jack
图标样式
图标样式、架构图片导出/预览
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
预览和url购买
remove check button
Merge branch 'preview' into dev