fix放大缩小问题
Merge branch 'feature/fixscale' into dev
计算格子位置
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
画线改动