linux环境测试修改
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/client/AgentClientController.java
	src/com/wk/agent/client/CmdLogProducer.java