修改globlebroker
Merge branch 'master' of https://github.com/luomuwen/map_agent

Conflicts:
	src/com/wk/msg/ZeroMQClientCZ.java
	src/com/wk/msg/ZeroMQP2PClient2.java