Merge pull request #315 from atellwu/softbalance

Softbalance 修复界面的bug
Merge pull request #316 from atellwu/softbalance

修复nginx模板的bug
Merge branch 'slb' of github.com:dianping/phoenix into softbalance
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
Merge pull request #318 from leoliang/master

for sync source
Merge branch 'slb' of github.com:dianping/phoenix into softbalance