20141214-1
Merge remote-tracking branch 'origin/master'

Conflicts:
	新建文本文档.txt