采集linux命令执行结果到文件
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/client/AgentClientConfig.java
	src/com/wk/agent/client/Collector.java