modify
Merge branch 'master' of https://github.com/zhangnian/dms

Conflicts:
	doc/Python分布式监控系统架构设计.doc