周报
123
Merge branch 'master' of https://github.com/jingwei-qa/documents

Conflicts:
	Templates/Thumbs.db