解决冲突
Merge branch 'jack' of https://github.com/lln7777/zhuyun into jack

Conflicts:
	public/javascripts/funcs.coffee
coffee->js