Merge branch 'master' of http://10.68.0.122:3000/mengqingchuang/k8swebapi

# Conflicts:
#	gateway-game-test/Dockerfile
#	gateway-game-test/agollo.json
#	gateway-game-test/config/gw.game.yaml
#	gateway-game-test/gateway-game-test
#	gateway-game-test/push.sh