commit arc settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	ArcVoice/src/com/wanmei/arcvoice/ArcVoiceHelper.java