修改层的默认大小
解决合并冲突
Merge branch 'feature/drag' into dev
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into dev
fixbug: Issue #145
修复画布无限拓展导致的兼容问题
fuck github
fucking github
新的bootcss文件
Merge branch 'feature/newbootcss' into dev
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/index.coffee
	public/javascripts/index.js
	public/stylesheets/index.css
Merge branch 'merge' into dev
Merge branch 'dev' of https://github.com/lln7777/zhuyun into dev
配置属性功能