Merge branch 'master' of https://github.com/ingbaobeigroup/mms

Conflicts:
	@/qi/4/title.png
	@/qi/index.all.json