fix 缩放问题
Merge branch 'fixbug/scale' into dev
层拖动时，其中的组件的线一起重画
添加左边工具栏滚动条
Merge branch 'fixbug/scale' into dev
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into merge/130905-1720
Merge branch 'merge/130905-1720' into dev
左边工具栏高度问题
Merge branch 'fixbug/scale' into dev
Merge branch 'feature/jack' of https://github.com/lln7777/zhuyun into merge/130905-1600
Merge branch 'merge/130905-1600' into dev
选中层时蒙版不消失的问题
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into dev
dragstart时取消冒泡
冲撞检测方法
Merge branch 'fixbug/duplicate' into dev
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into dev
Merge branch 'feature/jack' of https://github.com/lln7777/zhuyun into dev
修正冲撞检测方法
Merge branch 'fixbug/chongzhuang' into fixbug/duplicate