同步代码
Merge pull request #317 from atellwu/softbalance

同步代码
agentclient developing
Merge branch 'slb' of https://github.com/dianping/phoenix

Conflicts:
	phoenix-load-balancer/src/main/java/com/dianping/phoenix/lb/deploy/agent/DefaultAgentClient.java
for sync source