修改与调整
Merge branch 'master' of https://github.com/luomuwen/mapagent
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	config/agent.client.json
	src/com/wk/agent/client/ClientController.java
	src/com/wk/agent/client/CollectorItem.java
	src/com/wk/agent/client/FileCollect.java
在服务器端增加了记录处理的过程。