Merge branch 'master' of https://github.com/hailongz/vVoice

Conflicts:
	vVoice/vVoice/vVoice.h