临时提交
 Merge branch 'jack' of https://github.com/lln7777/zhuyun into sx

Conflicts:
	public/javascripts/components.coffee
	public/javascripts/components.js
Merge branch 'dev' of https://github.com/lln7777/zhuyun into sx
添加蒙版
计算格子位置
Merge branch 'feature/tools' into dev
画折线
 Merge branch 'dev' of https://github.com/lln7777/zhuyun into sx_func

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
画线改动
添加bootbox
画线拖动
Merge branch 'merge/130905-1500' into dev
Merge branch 'feature/dialog' into dev
Merge branch 'feature/jack' of https://github.com/lln7777/zhuyun into fixbug/scale

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
Merge branch 'fixbug/scale' into dev
拖动画线bug fix
去掉某些日志
fix 日志 画线
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into fixbug/scale

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
Merge branch 'feature/jack' of https://github.com/lln7777/zhuyun into fixbug/scale