Merge branch 'dev' of https://github.com/lln7777/zhuyun into sx_func
Merge branch 'dev' of https://github.com/lln7777/zhuyun into sx_func
线条放画布上的位置
重构冲撞检测及修复一些 bug
moveToBottom()->toBottom()
Merge branch 'dev' of https://github.com/lln7777/zhuyun into feature/impact

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
Merge
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into feature/impact
Merge branch 'dev' of https://github.com/lln7777/zhuyun into feature/impact
修复 N 多由合并导致的 bug
Merge branch 'feature/impact' of https://github.com/lln7777/zhuyun into feature/impact
Merge branch 'feature/impact' into dev
修复拓展画布导致的 bug
Merge branch 'feature/drag' of https://github.com/lln7777/zhuyun into optimize
fix bug
修复合并导致的层偶见同时拖动
fixbug: 拖动层和拖动组件的时候不能准确定位
Merge branch 'fixbug' into dev