添加category的默认属性
Merge branch 'newui' into newpage
添加导向页面
Merge branch 'newpage' into dev
fix style bug and add copy feature
Merge branch 'feature/copy' of https://github.com/lln7777/zhuyun into dev

Conflicts:
	public/stylesheets/index.css
修正getCategory， 添加绑定复制的方法
Merge branch 'layercopy' into dev
组件的复制
实现组件的复制
copy layer
Merge branch 'feature/copy' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
Merge branch 'merge' into dev
layer 复制功能完善
Merge branch 'layercopy' into dev
线条新样式
Merge branch 'newlineconfirm' into dev
完成组件复制功能
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/components.coffee
	public/javascripts/components.js
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/index.coffee
	public/javascripts/index.js
	views/index.ejs
Merge branch 'merge' into dev