1
Merge branch 'master' of https://github.com/luomuwen/map_agent

Conflicts:
	src/com/wk/monitor/config/ClassificationInfo.java
	src/com/wk/monitor/config/MonitorEnums.java