测试动态配置
Merge branch 'master' of https://github.com/luomuwen/mapagent

Conflicts:
	config/logger.properties
	src/com/wk/tmp/TestLog.java