修改写入html文件类
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	src/com/wk/agent/dao/CollectVRouterData.java
整理规范类