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

Conflicts:
	map_agent_web/WebContent/Home_files/home.css
	map_agent_web/WebContent/home.html
	map_agent_web/WebContent/home.js
	src/com/wk/monitor/access/DataAccessEngine.java
	src/com/wk/monitor/access/ISQLGenerator.java
	src/com/wk/monitor/access/IndicatorDao.java
	src/com/wk/monitor/access/impl/AbstractSQLGenerator.java
	src/com/wk/monitor/access/impl/IndicatorCacheDao.java
	src/com/wk/monitor/access/impl/IndicatorDBDao.java
	src/com/wk/monitor/compute/IndicatorHelper.java
	src/com/wk/monitor/compute/group/AbstractGroupingProcessor.java
	src/com/wk/monitor/compute/state/ObjectStateCalculation.java