更新配置
Merge branch 'master' of https://github.com/lg-norron/odin

Conflicts:
	src/main/java/com/southwind/odin/task/NewsQuartz.java