优化拖动检测
完善拖动的碰撞检测
完善画布操作
层模块化
Merge branch 'jack' of https://github.com/lln7777/zhuyun into jack

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/global.coffee
	public/javascripts/global.js
	public/javascripts/index.js
	views/index.ejs
 Merge branch 'jack' of https://github.com/lln7777/zhuyun into sx

Conflicts:
	public/javascripts/components.coffee
	public/javascripts/components.js
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/global.coffee
	public/javascripts/index.js
去掉画直线的文字
Line抽象类，自动画线实现
Merge branch 'feature/AbsLine' into dev
完善组件和层的四个角事件和操作
Merge branch 'dev' into ansel

Conflicts:
	public/javascripts/lines.coffee
	public/javascripts/lines.js