调整了一些结构
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	test/com/wk/agent/TestDumpUtil.java
代码结构调整
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/parse/CmdResultCollector.java
	src/com/wk/agent/parse/DumpUtil.java