改为utf-8编码
清理不需要的文件
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	samples/Cpp/TestCpp/Readme.txt