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

Conflicts:
	src/com/wk/agent/business/VRouterBusinessService.java
	src/com/wk/agent/parse/ParseController.java