修改了一些方法
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/AgentCollectConfig.java
	src/com/wk/agent/collect/CmdCollect.java
	src/com/wk/agent/send/Sender.java
新增AgentServerConfig  server端配置解析类