层没有配置，从左下菜单中去掉
Merge branch 'newui' of https://github.com/lvlx/zhuyun into jack
add feature / fix bug
Merge branch 'jack' of https://github.com/lln7777/zhuyun into merge
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	views/main.ejs
Merge branch 'merge' into dev
添加不支持页面
fix
user agent fix
fix ie
fix
组件拖过去到画布上之后默认选中
fix css
Merge branch 'merge' into dev
升级kineticjs 到 v0.7.1
Merge branch 'fixipad' into dev