改动DelimiterResolve
Merge branch 'master' of https://github.com/luomuwen/map_agent
修改FileSource类
Merge branch 'master' of https://github.com/luomuwen/map_agent

Conflicts:
	config/agent.properties