测试了客户端的采集功能
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/client/Collector.java
	src/com/wk/agent/collect/CollectorController.java