修改了一些采集的实现
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/client/CollectDataQueue.java