update
Merge branch 'master' of https://github.com/gsdocker/gsdocker

Conflicts:
	client.go
	cmd/gsluac/gen4lua.go
	cmd/gsluac/tpl4lua.go
	proto.gs.go
	sample/gw/gw
	sample/sample.gs.go