Merge remote-tracking branch 'origin/master'

Conflicts:
	VoiceText-WEBAPI/VoiceText-WEBAPI/main.cpp
c++