db配置
Merge branch 'master' of https://github.com/luomuwen/map_agent

Conflicts:
	config/defaultdb.properties
修改了配置文件
Merge branch 'master' of https://github.com/luomuwen/map_agent

Conflicts:
	config/system.properties