临时提交
 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 'dev' of https://github.com/lln7777/zhuyun into sx_func

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
画线改动
画线拖动
Merge branch 'merge/130905-1500' into dev