对配置文件的解析
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	test/com/wk/agent/TestDumpUtil.java