修改输出方式为josn；整合输出html相关类
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/parse/task/VRouterLogParserTask.java