增加了产品模式与非产品模式
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/parse/Main.java
	src/com/wk/agent/parse/task/VMenuLogParserTask.java