修改配置文件。
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	config/agent.client.json