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

Conflicts:
	config/system.properties
	src/com/wk/alarm/Object_stateDaoService.java