版本代码测试
Merge branch 'devleop' of https://github.com/wfcfan/honghezhouTTS into devleop

Conflicts:
	AndroidManifest.xml