增加采集
Merge branch 'master' of https://github.com/luomuwen/mapagent
Merge branch 'master' of https://github.com/luomuwen/mapagent
修改了Collector的采集方式，改为用线程
Merge branch 'master' of https://github.com/luomuwen/mapagent
Merge branch 'master' of https://github.com/luomuwen/mapagent
增加了client端的采集
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/AgentCollectConfig.java