fix价格核算bug
Merge branch 'fixprice' into dev
修复54f3d37被误删的代码
Merge branch 'fixmerge' into dev
Merge branch 'merge' into dev

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
拖动画布时候，隐藏帮助
Merge branch 'fixhide' into dev
Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
 Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

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