解决方案
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo