1.合并线上的更新
Merge branch 'master' of https://github.com/DrayChou/gor

Conflicts:
	compile.go
	gor/gor.go
	payload.go
	plugins.go